diff options
Diffstat (limited to 'ext/mysqlnd/mysqlnd_alloc.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_alloc.c | 40 |
1 files changed, 4 insertions, 36 deletions
diff --git a/ext/mysqlnd/mysqlnd_alloc.c b/ext/mysqlnd/mysqlnd_alloc.c index 42ce55a36a..e033eb78e7 100644 --- a/ext/mysqlnd/mysqlnd_alloc.c +++ b/ext/mysqlnd/mysqlnd_alloc.c @@ -62,7 +62,6 @@ PHPAPI const char * mysqlnd_debug_std_no_trace_funcs[] = NULL /* must be always last */ }; - #if ZEND_DEBUG #else #define __zend_orig_filename "/unknown/unknown" @@ -112,7 +111,6 @@ void * _mysqlnd_emalloc(size_t size MYSQLND_MEM_D) } /* }}} */ - /* {{{ _mysqlnd_pemalloc */ void * _mysqlnd_pemalloc(size_t size, zend_bool persistent MYSQLND_MEM_D) { @@ -155,7 +153,6 @@ void * _mysqlnd_pemalloc(size_t size, zend_bool persistent MYSQLND_MEM_D) } /* }}} */ - /* {{{ _mysqlnd_ecalloc */ void * _mysqlnd_ecalloc(unsigned int nmemb, size_t size MYSQLND_MEM_D) { @@ -196,7 +193,6 @@ void * _mysqlnd_ecalloc(unsigned int nmemb, size_t size MYSQLND_MEM_D) } /* }}} */ - /* {{{ _mysqlnd_pecalloc */ void * _mysqlnd_pecalloc(unsigned int nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D) { @@ -238,7 +234,6 @@ void * _mysqlnd_pecalloc(unsigned int nmemb, size_t size, zend_bool persistent M } /* }}} */ - /* {{{ _mysqlnd_erealloc */ void * _mysqlnd_erealloc(void *ptr, size_t new_size MYSQLND_MEM_D) { @@ -279,7 +274,6 @@ void * _mysqlnd_erealloc(void *ptr, size_t new_size MYSQLND_MEM_D) } /* }}} */ - /* {{{ _mysqlnd_perealloc */ void * _mysqlnd_perealloc(void *ptr, size_t new_size, zend_bool persistent MYSQLND_MEM_D) { @@ -323,7 +317,6 @@ void * _mysqlnd_perealloc(void *ptr, size_t new_size, zend_bool persistent MYSQL } /* }}} */ - /* {{{ _mysqlnd_efree */ void _mysqlnd_efree(void *ptr MYSQLND_MEM_D) { @@ -354,7 +347,6 @@ void _mysqlnd_efree(void *ptr MYSQLND_MEM_D) } /* }}} */ - /* {{{ _mysqlnd_pefree */ void _mysqlnd_pefree(void *ptr, zend_bool persistent MYSQLND_MEM_D) { @@ -386,7 +378,6 @@ void _mysqlnd_pefree(void *ptr, zend_bool persistent MYSQLND_MEM_D) } /* }}} */ - /* {{{ _mysqlnd_malloc */ void * _mysqlnd_malloc(size_t size MYSQLND_MEM_D) { @@ -425,7 +416,6 @@ void * _mysqlnd_malloc(size_t size MYSQLND_MEM_D) } /* }}} */ - /* {{{ _mysqlnd_calloc */ void * _mysqlnd_calloc(unsigned int nmemb, size_t size MYSQLND_MEM_D) { @@ -464,7 +454,6 @@ void * _mysqlnd_calloc(unsigned int nmemb, size_t size MYSQLND_MEM_D) } /* }}} */ - /* {{{ _mysqlnd_realloc */ void * _mysqlnd_realloc(void *ptr, size_t new_size MYSQLND_MEM_D) { @@ -506,7 +495,6 @@ void * _mysqlnd_realloc(void *ptr, size_t new_size MYSQLND_MEM_D) } /* }}} */ - /* {{{ _mysqlnd_free */ void _mysqlnd_free(void *ptr MYSQLND_MEM_D) { @@ -541,7 +529,6 @@ void _mysqlnd_free(void *ptr MYSQLND_MEM_D) #define SMART_STR_PREALLOC 512 #include "ext/standard/php_smart_str.h" - /* {{{ _mysqlnd_pestrndup */ char * _mysqlnd_pestrndup(const char * const ptr, size_t length, zend_bool persistent MYSQLND_MEM_D) { @@ -577,12 +564,11 @@ char * _mysqlnd_pestrndup(const char * const ptr, size_t length, zend_bool persi } /* }}} */ - /* {{{ _mysqlnd_pestrdup */ char * _mysqlnd_pestrdup(const char * const ptr, zend_bool persistent MYSQLND_MEM_D) { char * ret; - smart_str tmp_str = {0, 0, 0}; + smart_str tmp_str = {0}; const char * p = ptr; zend_bool collect_memory_statistics = MYSQLND_G(collect_memory_statistics); TRACE_ALLOC_ENTER(mysqlnd_pestrdup_name); @@ -597,11 +583,11 @@ char * _mysqlnd_pestrdup(const char * const ptr, zend_bool persistent MYSQLND_ME smart_str_appendc(&tmp_str, *p); } while (*p++); - ret = (persistent) ? __zend_malloc(tmp_str.len + sizeof(size_t)) : _emalloc(REAL_SIZE(tmp_str.len + sizeof(size_t)) ZEND_FILE_LINE_CC ZEND_FILE_LINE_ORIG_RELAY_CC); - memcpy(FAKE_PTR(ret), tmp_str.c, tmp_str.len); + ret = (persistent) ? __zend_malloc(tmp_str.s->len + sizeof(size_t)) : _emalloc(REAL_SIZE(tmp_str.s->len + sizeof(size_t)) ZEND_FILE_LINE_CC ZEND_FILE_LINE_ORIG_RELAY_CC); + memcpy(FAKE_PTR(ret), tmp_str.s->val, tmp_str.s->len); if (ret && collect_memory_statistics) { - *(size_t *) ret = tmp_str.len; + *(size_t *) ret = tmp_str.s->len; MYSQLND_INC_GLOBAL_STATISTIC(persistent? STAT_MEM_STRDUP_COUNT : STAT_MEM_ESTRDUP_COUNT); } smart_str_free(&tmp_str); @@ -610,7 +596,6 @@ char * _mysqlnd_pestrdup(const char * const ptr, zend_bool persistent MYSQLND_ME } /* }}} */ - /* {{{ _mysqlnd_sprintf */ PHPAPI int _mysqlnd_sprintf(char ** pbuf, size_t max_len, const char *format, ...) { @@ -623,7 +608,6 @@ PHPAPI int _mysqlnd_sprintf(char ** pbuf, size_t max_len, const char *format, .. } /* }}} */ - /* {{{ _mysqlnd_sprintf_free */ PHPAPI void _mysqlnd_sprintf_free(char * p) { @@ -638,7 +622,6 @@ PHPAPI int _mysqlnd_vsprintf(char ** pbuf, size_t max_len, const char * format, } /* }}} */ - #define MYSQLND_DEBUG_MEMORY 1 #if MYSQLND_DEBUG_MEMORY == 0 @@ -650,7 +633,6 @@ static void * mysqlnd_zend_mm_emalloc(size_t size MYSQLND_MEM_D) } /* }}} */ - /* {{{ mysqlnd_zend_mm_pemalloc */ static void * mysqlnd_zend_mm_pemalloc(size_t size, zend_bool persistent MYSQLND_MEM_D) { @@ -658,7 +640,6 @@ static void * mysqlnd_zend_mm_pemalloc(size_t size, zend_bool persistent MYSQLND } /* }}} */ - /* {{{ mysqlnd_zend_mm_ecalloc */ static void * mysqlnd_zend_mm_ecalloc(unsigned int nmemb, size_t size MYSQLND_MEM_D) { @@ -666,7 +647,6 @@ static void * mysqlnd_zend_mm_ecalloc(unsigned int nmemb, size_t size MYSQLND_ME } /* }}} */ - /* {{{ mysqlnd_zend_mm_pecalloc */ static void * mysqlnd_zend_mm_pecalloc(unsigned int nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D) { @@ -674,7 +654,6 @@ static void * mysqlnd_zend_mm_pecalloc(unsigned int nmemb, size_t size, zend_boo } /* }}} */ - /* {{{ mysqlnd_zend_mm_erealloc */ static void * mysqlnd_zend_mm_erealloc(void *ptr, size_t new_size MYSQLND_MEM_D) { @@ -682,7 +661,6 @@ static void * mysqlnd_zend_mm_erealloc(void *ptr, size_t new_size MYSQLND_MEM_D) } /* }}} */ - /* {{{ mysqlnd_zend_mm_perealloc */ static void * mysqlnd_zend_mm_perealloc(void *ptr, size_t new_size, zend_bool persistent MYSQLND_MEM_D) { @@ -690,7 +668,6 @@ static void * mysqlnd_zend_mm_perealloc(void *ptr, size_t new_size, zend_bool pe } /* }}} */ - /* {{{ mysqlnd_zend_mm_efree */ static void mysqlnd_zend_mm_efree(void * ptr MYSQLND_MEM_D) { @@ -698,7 +675,6 @@ static void mysqlnd_zend_mm_efree(void * ptr MYSQLND_MEM_D) } /* }}} */ - /* {{{ mysqlnd_zend_mm_pefree */ static void mysqlnd_zend_mm_pefree(void * ptr, zend_bool persistent MYSQLND_MEM_D) { @@ -706,7 +682,6 @@ static void mysqlnd_zend_mm_pefree(void * ptr, zend_bool persistent MYSQLND_MEM_ } /* }}} */ - /* {{{ mysqlnd_zend_mm_malloc */ static void * mysqlnd_zend_mm_malloc(size_t size MYSQLND_MEM_D) { @@ -714,7 +689,6 @@ static void * mysqlnd_zend_mm_malloc(size_t size MYSQLND_MEM_D) } /* }}} */ - /* {{{ mysqlnd_zend_mm_calloc */ static void * mysqlnd_zend_mm_calloc(unsigned int nmemb, size_t size MYSQLND_MEM_D) { @@ -722,7 +696,6 @@ static void * mysqlnd_zend_mm_calloc(unsigned int nmemb, size_t size MYSQLND_MEM } /* }}} */ - /* {{{ mysqlnd_zend_mm_realloc */ static void * mysqlnd_zend_mm_realloc(void * ptr, size_t new_size MYSQLND_MEM_D) { @@ -730,7 +703,6 @@ static void * mysqlnd_zend_mm_realloc(void * ptr, size_t new_size MYSQLND_MEM_D) } /* }}} */ - /* {{{ mysqlnd_zend_mm_free */ static void mysqlnd_zend_mm_free(void * ptr MYSQLND_MEM_D) { @@ -738,7 +710,6 @@ static void mysqlnd_zend_mm_free(void * ptr MYSQLND_MEM_D) } /* }}} */ - /* {{{ mysqlnd_zend_mm_pestrndup */ static char * mysqlnd_zend_mm_pestrndup(const char * const ptr, size_t length, zend_bool persistent MYSQLND_MEM_D) { @@ -746,7 +717,6 @@ static char * mysqlnd_zend_mm_pestrndup(const char * const ptr, size_t length, z } /* }}} */ - /* {{{ mysqlnd_zend_mm_pestrdup */ static char * mysqlnd_zend_mm_pestrdup(const char * const ptr, zend_bool persistent MYSQLND_MEM_D) { @@ -756,7 +726,6 @@ static char * mysqlnd_zend_mm_pestrdup(const char * const ptr, zend_bool persist #endif - PHPAPI struct st_mysqlnd_allocator_methods mysqlnd_allocator = { #if MYSQLND_DEBUG_MEMORY @@ -797,7 +766,6 @@ PHPAPI struct st_mysqlnd_allocator_methods mysqlnd_allocator = #endif }; - /* * Local variables: * tab-width: 4 |