diff options
| author | Nikita Popov <nikic@php.net> | 2015-07-17 17:48:02 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-07-17 17:48:02 +0200 |
| commit | 8a9eee8f7e21e377d8897c4b43c1f2e5d44f1ef0 (patch) | |
| tree | b01ce120eaf8f99a7369459e1f9ed4a8836fd4ad | |
| parent | 0039a3e96f52b419758c93b10f581251d5e6daa1 (diff) | |
| download | php-git-8a9eee8f7e21e377d8897c4b43c1f2e5d44f1ef0.tar.gz | |
Fix mysqlnd warnings
| -rw-r--r-- | ext/mysqlnd/mysqlnd_debug.h | 1 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.c | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/ext/mysqlnd/mysqlnd_debug.h b/ext/mysqlnd/mysqlnd_debug.h index 1e6d0c17a6..1a57143507 100644 --- a/ext/mysqlnd/mysqlnd_debug.h +++ b/ext/mysqlnd/mysqlnd_debug.h @@ -115,6 +115,7 @@ PHPAPI MYSQLND_DEBUG * mysqlnd_debug_init(const char * skip_functions[]); struct timeval __dbg_prof_tp = {0}; \ uint64_t __dbg_prof_start = 0; /* initialization is needed */ \ zend_bool dbg_skip_trace = TRUE; \ + ((void)__dbg_prof_start); \ if ((dbg_obj1)) { \ dbg_skip_trace = !(dbg_obj1)->m->func_enter((dbg_obj1), __LINE__, __FILE__, func_name, strlen(func_name)); \ } \ diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index 70e0cf3d55..0923a988ed 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -582,9 +582,8 @@ size_t php_mysqlnd_auth_write(void * _packet, MYSQLND_CONN_DATA * conn) { zend_string * key; - zend_ulong unused_num_key; zval * entry_value; - ZEND_HASH_FOREACH_KEY_VAL(packet->connect_attr, unused_num_key, key, entry_value) { + ZEND_HASH_FOREACH_STR_KEY_VAL(packet->connect_attr, key, entry_value) { if (key) { /* HASH_KEY_IS_STRING */ size_t value_len = Z_STRLEN_P(entry_value); @@ -621,9 +620,8 @@ size_t php_mysqlnd_auth_write(void * _packet, MYSQLND_CONN_DATA * conn) #else { zend_string * key; - zend_ulong unused_num_key; zval * entry_value; - ZEND_HASH_FOREACH_KEY_VAL(packet->connect_attr, unused_num_key, key, entry_value) { + ZEND_HASH_FOREACH_STR_KEY_VAL(packet->connect_attr, key, entry_value) { if (key) { /* HASH_KEY_IS_STRING */ size_t value_len = Z_STRLEN_P(entry_value); |