diff options
| author | Andrey Hristov <andrey@php.net> | 2009-06-11 08:30:08 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2009-06-11 08:30:08 +0000 |
| commit | a3b85c28c60d83a97d57329489ac0507af9db7ff (patch) | |
| tree | fcbec3feb376bf9962d04f5c77e0d6f7e9fdc16f /ext/mysqlnd/mysqlnd_wireprotocol.c | |
| parent | 8da7275f1bc50d1eda5984bf386766b83461f3d7 (diff) | |
| download | php-git-a3b85c28c60d83a97d57329489ac0507af9db7ff.tar.gz | |
Sync with PHP6 - TSRMLS_FETCH
Extract reference decrement in own function
Remove PHPAPI of a function and make it static as it is not called
externally
Diffstat (limited to 'ext/mysqlnd/mysqlnd_wireprotocol.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index 2924827e9c..c9cc38241e 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -42,7 +42,6 @@ #define MYSQLND_DUMP_HEADER_N_BODY2 #define MYSQLND_DUMP_HEADER_N_BODY_FULL2 - #define PACKET_READ_HEADER_AND_BODY(packet, conn, buf, buf_size, packet_type_as_text, packet_type) \ { \ if (FAIL == mysqlnd_read_header((conn), &((packet)->header) TSRMLS_CC)) {\ @@ -1364,7 +1363,7 @@ void php_mysqlnd_rowp_read_binary_protocol(MYSQLND_MEMORY_POOL_CHUNK * row_buffe zval **current_field, **end_field, **start_field; zend_bool as_unicode = conn->options.numeric_and_datetime_as_unicode; zend_bool allocated; - void *obj; + void *obj = NULL; DBG_ENTER("php_mysqlnd_rowp_read_binary_protocol"); |