com php-src: MNDR: - remove dead code: ext/mysqlnd/mysqlnd_wi reprotocol.c

From: Date: Thu, 12 Nov 2015 15:19:16 +0000
Subject: com php-src: MNDR: - remove dead code: ext/mysqlnd/mysqlnd_wi reprotocol.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-89793@lists.php.net to get a copy of this message
Commit: 5abee1948eb71f9a0e163e3ce491b3e10ee0414e Author: Andrey Hristov <andrey@php.net> Mon, 2 Nov 2015 18:08:53 +0100 Parents: 71e703761f8af481b39aecb8afc6fab10e9eb4f3 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5abee1948eb71f9a0e163e3ce491b3e10ee0414e Log: MNDR: - remove dead code Changed paths: M ext/mysqlnd/mysqlnd_wireprotocol.c Diff: diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index c478ccb..f4f6a82 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -572,25 +572,6 @@ size_t php_mysqlnd_auth_write(void * _packet) if (packet->connect_attr && zend_hash_num_elements(packet->connect_attr)) { size_t ca_payload_len = 0; -#ifdef OLD_CODE - HashPosition pos_value; - const char ** entry_value; - zend_hash_internal_pointer_reset_ex(packet->connect_attr, &pos_value); - while (SUCCESS == zend_hash_get_current_data_ex(packet->connect_attr, (void **)&entry_value, &pos_value)) { - char *s_key; - unsigned int s_len; - zend_ulong num_key; - size_t value_len = strlen(*entry_value); - - if (HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(packet->connect_attr, &s_key, &s_len, &num_key, &pos_value)) { - ca_payload_len += php_mysqlnd_net_store_length_size(s_len); - ca_payload_len += s_len; - ca_payload_len += php_mysqlnd_net_store_length_size(value_len); - ca_payload_len += value_len; - } - zend_hash_move_forward_ex(conn->options->connect_attr, &pos_value); - } -#else { zend_string * key; @@ -606,30 +587,10 @@ size_t php_mysqlnd_auth_write(void * _packet) } } ZEND_HASH_FOREACH_END(); } -#endif + if (sizeof(buffer) >= (ca_payload_len + php_mysqlnd_net_store_length_size(ca_payload_len) + (p - buffer))) { p = php_mysqlnd_net_store_length(p, ca_payload_len); -#ifdef OLD_CODE - zend_hash_internal_pointer_reset_ex(packet->connect_attr, &pos_value); - while (SUCCESS == zend_hash_get_current_data_ex(packet->connect_attr, (void **)&entry_value, &pos_value)) { - char *s_key; - unsigned int s_len; - zend_ulong num_key; - size_t value_len = strlen(*entry_value); - if (HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(packet->connect_attr, &s_key, &s_len, &num_key, &pos_value)) { - /* copy key */ - p = php_mysqlnd_net_store_length(p, s_len); - memcpy(p, s_key, s_len); - p+= s_len; - /* copy value */ - p = php_mysqlnd_net_store_length(p, value_len); - memcpy(p, *entry_value, value_len); - p+= value_len; - } - zend_hash_move_forward_ex(conn->options->connect_attr, &pos_value); - } -#else { zend_string * key; zval * entry_value; @@ -648,7 +609,6 @@ size_t php_mysqlnd_auth_write(void * _packet) } } ZEND_HASH_FOREACH_END(); } -#endif } else { /* cannot put the data - skip */ }

« previous php.cvs (#89793) next »