andrey Tue May 26 13:42:43 2009 UTC
Modified files:
/php-src/ext/mysqlnd php_mysqlnd.c
Log:
ws
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/php_mysqlnd.c?r1=1.12&r2=1.13&diff_format=u
Index: php-src/ext/mysqlnd/php_mysqlnd.c
diff -u php-src/ext/mysqlnd/php_mysqlnd.c:1.12
php-src/ext/mysqlnd/php_mysqlnd.c:1.13
--- php-src/ext/mysqlnd/php_mysqlnd.c:1.12 Fri Mar 27 19:28:26 2009
+++ php-src/ext/mysqlnd/php_mysqlnd.c Tue May 26 13:42:43 2009
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysqlnd.c,v 1.12 2009/03/27 19:28:26 felipe Exp $ */
+/* $Id: php_mysqlnd.c,v 1.13 2009/05/26 13:42:43 andrey Exp $ */
#include "php.h"
#include "php_ini.h"
#include "mysqlnd.h"
@@ -46,20 +46,18 @@
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(values), &pos_values);
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(values),
- (void **)&values_entry, &pos_values) == SUCCESS) {
+
(void **)&values_entry, &pos_values) == SUCCESS) {
zstr string_key;
uint string_key_len;
ulong num_key;
- int s_len;
+ int s_len;
char *s = NULL;
-
-
TSRMLS_FETCH();
zend_hash_get_current_key_ex(Z_ARRVAL_P(values), &string_key,
&string_key_len, &num_key, 0, &pos_values);
convert_to_string(*values_entry);
-
+
if
(zend_unicode_to_string(ZEND_U_CONVERTER(UG(runtime_encoding_conv)),
&s, &s_len,
string_key.u, string_key_len TSRMLS_CC) == SUCCESS) {
php_info_print_table_row(2, s,
Z_STRVAL_PP(values_entry));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
