svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c trunk/ext/mysqlnd/mysqlnd.c
trunk/ext/mysqlnd/mysqlnd_result.c trunk/ext/mysqlnd/mysqlnd_wireprotocol.c

pajoye Mon, 30 Nov 2009 10:56:01 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=291483 Log: - void is NaN, you can't do math ops on void. Declarations go first. Fix TS build Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c U php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c U php/php-src/trunk/ext/mysqlnd/mysqlnd.c U php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c U php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2009-11-30 09:52:48 UTC (rev 291482) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2009-11-30 10:56:01 UTC (rev 291483) @@ -2393,7 +2393,7 @@ if (!conn || plugin_id >= mysqlnd_plugin_count()) { return NULL; } - DBG_RETURN((void *)conn + sizeof(MYSQLND) + plugin_id * sizeof(void *)); + DBG_RETURN((void *)(conn + sizeof(MYSQLND) + plugin_id * sizeof(void *))); } /* }}} */ Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2009-11-30 09:52:48 UTC (rev 291482) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2009-11-30 10:56:01 UTC (rev 291483) @@ -2073,7 +2073,7 @@ if (!result || plugin_id >= mysqlnd_plugin_count()) { return NULL; } - DBG_RETURN((void *)result + sizeof(MYSQLND_RES) + plugin_id * sizeof(void *)); + DBG_RETURN((void *)(result + sizeof(MYSQLND_RES) + plugin_id * sizeof(void *))); } /* }}} */ Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c 2009-11-30 09:52:48 UTC (rev 291482) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c 2009-11-30 10:56:01 UTC (rev 291483) @@ -1307,8 +1307,8 @@ static void php_mysqlnd_rset_header_free_mem(void *_packet, zend_bool alloca TSRMLS_DC) { + php_mysql_packet_rset_header *p= (php_mysql_packet_rset_header *) _packet; DBG_ENTER("php_mysqlnd_rset_header_free_mem"); - php_mysql_packet_rset_header *p= (php_mysql_packet_rset_header *) _packet; if (p->info_or_local_file) { mnd_efree(p->info_or_local_file); p->info_or_local_file = NULL; Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c 2009-11-30 09:52:48 UTC (rev 291482) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c 2009-11-30 10:56:01 UTC (rev 291483) @@ -45,14 +45,14 @@ 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) { - TSRMLS_FETCH(); + (void **)&values_entry, &pos_values) == SUCCESS) { zstr string_key; uint string_key_len; ulong num_key; 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); Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c =================================================================== --- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2009-11-30 09:52:48 UTC (rev 291482) +++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2009-11-30 10:56:01 UTC (rev 291483) @@ -2393,7 +2393,7 @@ if (!conn || plugin_id >= mysqlnd_plugin_count()) { return NULL; } - DBG_RETURN((void *)conn + sizeof(MYSQLND) + plugin_id * sizeof(void *)); + DBG_RETURN((void *)(conn + sizeof(MYSQLND) + plugin_id * sizeof(void *))); } /* }}} */ Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c =================================================================== --- php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c 2009-11-30 09:52:48 UTC (rev 291482) +++ php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c 2009-11-30 10:56:01 UTC (rev 291483) @@ -2073,7 +2073,7 @@ if (!result || plugin_id >= mysqlnd_plugin_count()) { return NULL; } - DBG_RETURN((void *)result + sizeof(MYSQLND_RES) + plugin_id * sizeof(void *)); + DBG_RETURN((void *)(result + sizeof(MYSQLND_RES) + plugin_id * sizeof(void *))); } /* }}} */ Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c =================================================================== --- php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c 2009-11-30 09:52:48 UTC (rev 291482) +++ php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c 2009-11-30 10:56:01 UTC (rev 291483) @@ -1307,8 +1307,8 @@ static void php_mysqlnd_rset_header_free_mem(void *_packet, zend_bool alloca TSRMLS_DC) { + php_mysql_packet_rset_header *p= (php_mysql_packet_rset_header *) _packet; DBG_ENTER("php_mysqlnd_rset_header_free_mem"); - php_mysql_packet_rset_header *p= (php_mysql_packet_rset_header *) _packet; if (p->info_or_local_file) { mnd_efree(p->info_or_local_file); p->info_or_local_file = NULL;