diff options
author | Dmitry Stogov <dmitry@php.net> | 2010-07-08 07:38:59 +0000 |
---|---|---|
committer | Dmitry Stogov <dmitry@php.net> | 2010-07-08 07:38:59 +0000 |
commit | df8bf2a2de49b62265abdb412a9d96a41498884a (patch) | |
tree | 6587471e9f4a27549521b893f86942f0392aa041 /ext/mysqlnd/mysqlnd_debug.c | |
parent | c0c5c1ad4ce2336546e9454f69a0084ca206d879 (diff) | |
download | php-git-df8bf2a2de49b62265abdb412a9d96a41498884a.tar.gz |
Fixed checks for PHP_DEBUG macro
Diffstat (limited to 'ext/mysqlnd/mysqlnd_debug.c')
-rw-r--r-- | ext/mysqlnd/mysqlnd_debug.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/ext/mysqlnd/mysqlnd_debug.c b/ext/mysqlnd/mysqlnd_debug.c index 5022e03edc..e49da24366 100644 --- a/ext/mysqlnd/mysqlnd_debug.c +++ b/ext/mysqlnd/mysqlnd_debug.c @@ -626,7 +626,7 @@ mysqlnd_debug_init(const char * skip_functions[] TSRMLS_DC) /* {{{ _mysqlnd_debug */ PHPAPI void _mysqlnd_debug(const char * mode TSRMLS_DC) { -#ifdef PHP_DEBUG +#if PHP_DEBUG MYSQLND_DEBUG *dbg = MYSQLND_G(dbg); if (!dbg) { MYSQLND_G(dbg) = dbg = mysqlnd_debug_init(mysqlnd_debug_std_no_trace_funcs TSRMLS_CC); @@ -665,12 +665,12 @@ void * _mysqlnd_emalloc(size_t size MYSQLND_MEM_D) DBG_INF_FMT("file=%-15s line=%4d", strrchr(__zend_filename, PHP_DIR_SEPARATOR) + 1, __zend_lineno); -#ifdef PHP_DEBUG +#if PHP_DEBUG /* -1 is also "true" */ if (*threshold) { #endif ret = emalloc(REAL_SIZE(size)); -#ifdef PHP_DEBUG +#if PHP_DEBUG --*threshold; } else if (*threshold == 0) { ret = NULL; @@ -697,12 +697,12 @@ void * _mysqlnd_pemalloc(size_t size, zend_bool persistent MYSQLND_MEM_D) DBG_ENTER(mysqlnd_pemalloc_name); DBG_INF_FMT("file=%-15s line=%4d", strrchr(__zend_filename, PHP_DIR_SEPARATOR) + 1, __zend_lineno); -#ifdef PHP_DEBUG +#if PHP_DEBUG /* -1 is also "true" */ if (*threshold) { #endif ret = pemalloc(REAL_SIZE(size), persistent); -#ifdef PHP_DEBUG +#if PHP_DEBUG --*threshold; } else if (*threshold == 0) { ret = NULL; @@ -733,12 +733,12 @@ void * _mysqlnd_ecalloc(unsigned int nmemb, size_t size MYSQLND_MEM_D) DBG_INF_FMT("file=%-15s line=%4d", strrchr(__zend_filename, PHP_DIR_SEPARATOR) + 1, __zend_lineno); DBG_INF_FMT("before: %lu", zend_memory_usage(FALSE TSRMLS_CC)); -#ifdef PHP_DEBUG +#if PHP_DEBUG /* -1 is also "true" */ if (*threshold) { #endif ret = ecalloc(nmemb, REAL_SIZE(size)); -#ifdef PHP_DEBUG +#if PHP_DEBUG --*threshold; } else if (*threshold == 0) { ret = NULL; @@ -765,12 +765,12 @@ void * _mysqlnd_pecalloc(unsigned int nmemb, size_t size, zend_bool persistent M DBG_ENTER(mysqlnd_pecalloc_name); DBG_INF_FMT("file=%-15s line=%4d", strrchr(__zend_filename, PHP_DIR_SEPARATOR) + 1, __zend_lineno); -#ifdef PHP_DEBUG +#if PHP_DEBUG /* -1 is also "true" */ if (*threshold) { #endif ret = pecalloc(nmemb, REAL_SIZE(size), persistent); -#ifdef PHP_DEBUG +#if PHP_DEBUG --*threshold; } else if (*threshold == 0) { ret = NULL; @@ -802,12 +802,12 @@ void * _mysqlnd_erealloc(void *ptr, size_t new_size MYSQLND_MEM_D) DBG_INF_FMT("file=%-15s line=%4d", strrchr(__zend_filename, PHP_DIR_SEPARATOR) + 1, __zend_lineno); DBG_INF_FMT("ptr=%p old_size=%lu, new_size=%lu", ptr, old_size, new_size); -#ifdef PHP_DEBUG +#if PHP_DEBUG /* -1 is also "true" */ if (*threshold) { #endif ret = erealloc(REAL_PTR(ptr), REAL_SIZE(new_size)); -#ifdef PHP_DEBUG +#if PHP_DEBUG --*threshold; } else if (*threshold == 0) { ret = NULL; @@ -835,12 +835,12 @@ void * _mysqlnd_perealloc(void *ptr, size_t new_size, zend_bool persistent MYSQL DBG_INF_FMT("file=%-15s line=%4d", strrchr(__zend_filename, PHP_DIR_SEPARATOR) + 1, __zend_lineno); DBG_INF_FMT("ptr=%p old_size=%lu new_size=%lu persistent=%u", ptr, old_size, new_size, persistent); -#ifdef PHP_DEBUG +#if PHP_DEBUG /* -1 is also "true" */ if (*threshold) { #endif ret = perealloc(REAL_PTR(ptr), REAL_SIZE(new_size), persistent); -#ifdef PHP_DEBUG +#if PHP_DEBUG --*threshold; } else if (*threshold == 0) { ret = NULL; @@ -919,12 +919,12 @@ void * _mysqlnd_malloc(size_t size MYSQLND_MEM_D) DBG_ENTER(mysqlnd_malloc_name); DBG_INF_FMT("file=%-15s line=%4d", strrchr(__zend_filename, PHP_DIR_SEPARATOR) + 1, __zend_lineno); -#ifdef PHP_DEBUG +#if PHP_DEBUG /* -1 is also "true" */ if (*threshold) { #endif ret = malloc(REAL_SIZE(size)); -#ifdef PHP_DEBUG +#if PHP_DEBUG --*threshold; } else if (*threshold == 0) { ret = NULL; @@ -950,12 +950,12 @@ void * _mysqlnd_calloc(unsigned int nmemb, size_t size MYSQLND_MEM_D) DBG_ENTER(mysqlnd_calloc_name); DBG_INF_FMT("file=%-15s line=%4d", strrchr(__zend_filename, PHP_DIR_SEPARATOR) + 1, __zend_lineno); -#ifdef PHP_DEBUG +#if PHP_DEBUG /* -1 is also "true" */ if (*threshold) { #endif ret = calloc(nmemb, REAL_SIZE(size)); -#ifdef PHP_DEBUG +#if PHP_DEBUG --*threshold; } else if (*threshold == 0) { ret = NULL; @@ -983,12 +983,12 @@ void * _mysqlnd_realloc(void *ptr, size_t new_size MYSQLND_MEM_D) DBG_INF_FMT("ptr=%p new_size=%lu ", new_size, ptr); DBG_INF_FMT("before: %lu", zend_memory_usage(TRUE TSRMLS_CC)); -#ifdef PHP_DEBUG +#if PHP_DEBUG /* -1 is also "true" */ if (*threshold) { #endif ret = realloc(REAL_PTR(ptr), REAL_SIZE(new_size)); -#ifdef PHP_DEBUG +#if PHP_DEBUG --*threshold; } else if (*threshold == 0) { ret = NULL; |