diff options
author | Andrey Hristov <andrey@php.net> | 2008-11-06 10:37:47 +0000 |
---|---|---|
committer | Andrey Hristov <andrey@php.net> | 2008-11-06 10:37:47 +0000 |
commit | 9186528994f586a83523837b3e64fb2139728bad (patch) | |
tree | 1d6c4d3feb1f7fd21745d37af4c7d15db6cbc59f /ext/mysqlnd/mysqlnd_debug.c | |
parent | 963f7c02347a5a3e88657b8c759d9ce66e6c88d3 (diff) | |
download | php-git-9186528994f586a83523837b3e64fb2139728bad.tar.gz |
MFH:
Get rid of many defines (which simplifies the code a lot),
as well as uint->unsigned int
Diffstat (limited to 'ext/mysqlnd/mysqlnd_debug.c')
-rw-r--r-- | ext/mysqlnd/mysqlnd_debug.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/mysqlnd/mysqlnd_debug.c b/ext/mysqlnd/mysqlnd_debug.c index f6eeb695f5..e82935d2a6 100644 --- a/ext/mysqlnd/mysqlnd_debug.c +++ b/ext/mysqlnd/mysqlnd_debug.c @@ -89,7 +89,7 @@ MYSQLND_METHOD(mysqlnd_debug, log)(MYSQLND_DEBUG * self, enum_func_status ret; int i; char * message_line; - uint message_line_len; + unsigned int message_line_len; unsigned int flags = self->flags; char pid_buffer[10], time_buffer[30], file_buffer[200], line_buffer[6], level_buffer[7]; @@ -194,7 +194,7 @@ MYSQLND_METHOD(mysqlnd_debug, log_va)(MYSQLND_DEBUG *self, int i; enum_func_status ret; char * message_line, *buffer; - uint message_line_len; + unsigned int message_line_len; va_list args; unsigned int flags = self->flags; char pid_buffer[10], time_buffer[30], file_buffer[200], @@ -301,7 +301,7 @@ MYSQLND_METHOD(mysqlnd_debug, log_va)(MYSQLND_DEBUG *self, static zend_bool MYSQLND_METHOD(mysqlnd_debug, func_enter)(MYSQLND_DEBUG * self, unsigned int line, const char * const file, - char * func_name, uint func_name_len) + char * func_name, unsigned int func_name_len) { #ifdef MYSQLND_THREADED MYSQLND_ZTS(self); @@ -422,7 +422,7 @@ enum mysqlnd_debug_parser_state static void MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const mode) { - uint mode_len = strlen(mode), i; + unsigned int mode_len = strlen(mode), i; enum mysqlnd_debug_parser_state state = PARSER_WAIT_MODIFIER; self->flags = 0; @@ -487,7 +487,7 @@ MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const if (mode[j] == ',' || mode[j] == ':') { if (j > i + 2) { char func_name[1024]; - uint func_name_len = MIN(sizeof(func_name) - 1, j - i - 1); + unsigned int func_name_len = MIN(sizeof(func_name) - 1, j - i - 1); memcpy(func_name, mode + i + 1, func_name_len); func_name[func_name_len] = '\0'; @@ -719,7 +719,7 @@ void * _mysqlnd_pemalloc(size_t size, zend_bool persistent MYSQLND_MEM_D) /* {{{ _mysqlnd_ecalloc */ -void * _mysqlnd_ecalloc(uint nmemb, size_t size MYSQLND_MEM_D) +void * _mysqlnd_ecalloc(unsigned int nmemb, size_t size MYSQLND_MEM_D) { void *ret; DBG_ENTER(mysqlnd_ecalloc_name); @@ -744,7 +744,7 @@ void * _mysqlnd_ecalloc(uint nmemb, size_t size MYSQLND_MEM_D) /* {{{ _mysqlnd_pecalloc */ -void * _mysqlnd_pecalloc(uint nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D) +void * _mysqlnd_pecalloc(unsigned int nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D) { void *ret; DBG_ENTER(mysqlnd_pecalloc_name); @@ -889,7 +889,7 @@ void * _mysqlnd_malloc(size_t size MYSQLND_MEM_D) /* {{{ _mysqlnd_calloc */ -void * _mysqlnd_calloc(uint nmemb, size_t size MYSQLND_MEM_D) +void * _mysqlnd_calloc(unsigned int nmemb, size_t size MYSQLND_MEM_D) { void *ret; DBG_ENTER(mysqlnd_calloc_name); |