archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 14:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- void is NaN, you can't do math ops on void. Declarations go first. Fix TS build

Browse source
This commit is contained in:
Pierre Joye 2009-11-30 10:56:01 +00:00
parent 8109abba8b
commit 2a3ec70d10
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/mysqlnd/mysqlnd.c
View file

@ -2393,7 +2393,7 @@ PHPAPI void ** _mysqlnd_plugin_get_plugin_connection_data(const MYSQLND * conn,
if (!conn || plugin_id >= mysqlnd_plugin_count()) { if (!conn || plugin_id >= mysqlnd_plugin_count()) {
return NULL; return NULL;
} }
DBG_RETURN((void *)conn + sizeof(MYSQLND) + plugin_id * sizeof(void *)); DBG_RETURN((void *)(conn + sizeof(MYSQLND) + plugin_id * sizeof(void *)));
} }
/* }}} */ /* }}} */

2
ext/mysqlnd/mysqlnd_result.c
View file

@ -2073,7 +2073,7 @@ PHPAPI void ** _mysqlnd_plugin_get_plugin_result_data(const MYSQLND_RES * result
if (!result || plugin_id >= mysqlnd_plugin_count()) { if (!result || plugin_id >= mysqlnd_plugin_count()) {
return NULL; return NULL;
} }
DBG_RETURN((void *)result + sizeof(MYSQLND_RES) + plugin_id * sizeof(void *)); DBG_RETURN((void *)(result + sizeof(MYSQLND_RES) + plugin_id * sizeof(void *)));
} }
/* }}} */ /* }}} */

2
ext/mysqlnd/mysqlnd_wireprotocol.c
View file

@ -1307,8 +1307,8 @@ php_mysqlnd_rset_header_read(void *_packet, MYSQLND *conn TSRMLS_DC)
static static
void php_mysqlnd_rset_header_free_mem(void *_packet, zend_bool alloca TSRMLS_DC) void php_mysqlnd_rset_header_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
{ {
DBG_ENTER("php_mysqlnd_rset_header_free_mem");
php_mysql_packet_rset_header *p= (php_mysql_packet_rset_header *) _packet; php_mysql_packet_rset_header *p= (php_mysql_packet_rset_header *) _packet;
DBG_ENTER("php_mysqlnd_rset_header_free_mem");
if (p->info_or_local_file) { if (p->info_or_local_file) {
mnd_efree(p->info_or_local_file); mnd_efree(p->info_or_local_file);
p->info_or_local_file = NULL; p->info_or_local_file = NULL;

2
ext/mysqlnd/php_mysqlnd.c
View file

@ -46,13 +46,13 @@ PHPAPI void mysqlnd_minfo_print_hash(zval *values)
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(values), &pos_values); zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(values), &pos_values);
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(values), while (zend_hash_get_current_data_ex(Z_ARRVAL_P(values),
(void **)&values_entry, &pos_values) == SUCCESS) { (void **)&values_entry, &pos_values) == SUCCESS) {
TSRMLS_FETCH();
zstr string_key; zstr string_key;
uint string_key_len; uint string_key_len;
ulong num_key; ulong num_key;
int s_len; int s_len;
char *s = NULL; 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); 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); convert_to_string(*values_entry);