diff options
| author | Anatol Belski <ab@php.net> | 2016-11-26 15:18:42 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-11-26 17:29:01 +0100 |
| commit | b204b3abd19f86bd9217866189cdebcc6abc0d95 (patch) | |
| tree | 324e3c86634583ef7d58bc0f3e19dfbdeb85773c /ext/mysqlnd | |
| parent | 1b7e014d1ce21b9eb6021111c1005d047b5b9a1b (diff) | |
| download | php-git-b204b3abd19f86bd9217866189cdebcc6abc0d95.tar.gz | |
further normalizations, uint vs uint32_t
fix merge mistake
yet one more replacement run
Diffstat (limited to 'ext/mysqlnd')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_charset.c | 2 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_debug.c | 8 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_result.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ext/mysqlnd/mysqlnd_charset.c b/ext/mysqlnd/mysqlnd_charset.c index 2b3ddd0831..241c1cb5ba 100644 --- a/ext/mysqlnd/mysqlnd_charset.c +++ b/ext/mysqlnd/mysqlnd_charset.c @@ -410,7 +410,7 @@ static unsigned int check_mb_utf16(const char *start, const char *end) } -static uint mysqlnd_mbcharlen_utf16(unsigned int utf16) +static uint32_t mysqlnd_mbcharlen_utf16(unsigned int utf16) { return UTF16_HIGH_HEAD(utf16) ? 4 : 2; } diff --git a/ext/mysqlnd/mysqlnd_debug.c b/ext/mysqlnd/mysqlnd_debug.c index 3a03d56975..a446c5e2dc 100644 --- a/ext/mysqlnd/mysqlnd_debug.c +++ b/ext/mysqlnd/mysqlnd_debug.c @@ -249,7 +249,7 @@ MYSQLND_METHOD(mysqlnd_debug, func_enter)(MYSQLND_DEBUG * self, if ((self->flags & MYSQLND_DEBUG_DUMP_TRACE) == 0 || self->file_name == NULL) { return FALSE; } - if ((uint) zend_stack_count(&self->call_stack) >= self->nest_level_limit) { + if ((uint32_t) zend_stack_count(&self->call_stack) >= self->nest_level_limit) { return FALSE; } @@ -320,7 +320,7 @@ MYSQLND_METHOD(mysqlnd_debug, func_leave)(MYSQLND_DEBUG * self, unsigned int lin if ((self->flags & MYSQLND_DEBUG_DUMP_TRACE) == 0 || self->file_name == NULL) { return PASS; } - if ((uint) zend_stack_count(&self->call_stack) >= self->nest_level_limit) { + if ((uint32_t) zend_stack_count(&self->call_stack) >= self->nest_level_limit) { return PASS; } @@ -349,7 +349,7 @@ MYSQLND_METHOD(mysqlnd_debug, func_leave)(MYSQLND_DEBUG * self, unsigned int lin struct st_mysqlnd_dbg_function_profile f_profile_stack = {0}; struct st_mysqlnd_dbg_function_profile * f_profile = NULL; uint64_t own_time = call_time - mine_non_own_time; - uint func_name_len = strlen(*func_name); + uint32_t func_name_len = strlen(*func_name); self->m->log_va(self, line, file, zend_stack_count(&self->call_stack) - 1, NULL, "<%s (total=%u own=%u in_calls=%u)", *func_name, (unsigned int) call_time, (unsigned int) own_time, (unsigned int) mine_non_own_time @@ -401,7 +401,7 @@ MYSQLND_METHOD(mysqlnd_debug, func_leave)(MYSQLND_DEBUG * self, unsigned int lin f_profile->calls = 1; zend_hash_str_add_mem(&self->function_profiles, *func_name, func_name_len, f_profile, sizeof(struct st_mysqlnd_dbg_function_profile)); } - if ((uint) zend_stack_count(&self->call_time_stack)) { + if ((uint32_t) zend_stack_count(&self->call_time_stack)) { uint64_t parent_non_own_time = 0; parent_non_own_time_ptr = zend_stack_top(&self->call_time_stack); diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c index 513214d3fa..1d5e27b471 100644 --- a/ext/mysqlnd/mysqlnd_result.c +++ b/ext/mysqlnd/mysqlnd_result.c @@ -1400,7 +1400,7 @@ MYSQLND_METHOD(mysqlnd_res, store_result_fetch_data)(MYSQLND_CONN_DATA * const c } DBG_INF_FMT("ret=%s row_count=%u warnings=%u server_status=%u", ret == PASS? "PASS":"FAIL", - (uint) set->row_count, + (uint32_t) set->row_count, UPSERT_STATUS_GET_WARNINGS(conn->upsert_status), UPSERT_STATUS_GET_SERVER_STATUS(conn->upsert_status)); end: |