andrey Thu, 26 Nov 2009 11:10:47 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=291333
Log:
fix debug windows build as well as remove a compilation warning
(a header not included)
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_ps.c
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h
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-26 10:26:27 UTC
(rev 291332)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2009-11-26 11:10:47 UTC
(rev 291333)
@@ -157,7 +157,7 @@
}
#ifdef MYSQLND_COMPRESSION_ENABLED
if (conn->net.uncompressed_data) {
- conn->net.uncompressed_data->free(&conn->net.uncompressed_data
TSRMLS_CC);
+
conn->net.uncompressed_data->free_buffer(&conn->net.uncompressed_data
TSRMLS_CC);
}
#endif
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c 2009-11-26
10:26:27 UTC (rev 291332)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c 2009-11-26
11:10:47 UTC (rev 291333)
@@ -27,6 +27,7 @@
#include "mysqlnd_result_meta.h"
#include "mysqlnd_statistics.h"
#include "mysqlnd_debug.h"
+#include "mysqlnd_block_alloc.h"
#define MYSQLND_SILENT
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h 2009-11-26
10:26:27 UTC (rev 291332)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h 2009-11-26
11:10:47 UTC (rev 291333)
@@ -225,7 +225,7 @@
zend_bool (*is_empty)(struct st_mysqlnd_read_buffer *);
void (*read)(struct st_mysqlnd_read_buffer *, size_t count,
zend_uchar * dest);
size_t (*bytes_left)(struct st_mysqlnd_read_buffer *);
- void (*free)(struct st_mysqlnd_read_buffer ** TSRMLS_DC);
+ void (*free_buffer)(struct st_mysqlnd_read_buffer **
TSRMLS_DC);
} MYSQLND_READ_BUFFER;
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-26 10:26:27 UTC (rev 291332)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
2009-11-26 11:10:47 UTC (rev 291333)
@@ -270,7 +270,7 @@
ret->is_empty = php_mysqlnd_read_buffer_is_empty;
ret->read = php_mysqlnd_read_buffer_read;
ret->bytes_left = php_mysqlnd_read_buffer_bytes_left;
- ret->free = php_mysqlnd_read_buffer_free;
+ ret->free_buffer = php_mysqlnd_read_buffer_free;
ret->data = mnd_emalloc(count);
ret->size = ret->len = count;
ret->offset = 0;
@@ -680,7 +680,7 @@
DBG_INF_FMT("left %u to read", to_read);
if (TRUE ==
net->uncompressed_data->is_empty(net->uncompressed_data)) {
/* Everything was consumed. This should never
happen here, but for security */
-
net->uncompressed_data->free(&net->uncompressed_data TSRMLS_CC);
+
net->uncompressed_data->free_buffer(&net->uncompressed_data TSRMLS_CC);
}
}
if (to_read) {
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2009-11-26 10:26:27 UTC (rev
291332)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2009-11-26 11:10:47 UTC (rev
291333)
@@ -157,7 +157,7 @@
}
#ifdef MYSQLND_COMPRESSION_ENABLED
if (conn->net.uncompressed_data) {
- conn->net.uncompressed_data->free(&conn->net.uncompressed_data
TSRMLS_CC);
+
conn->net.uncompressed_data->free_buffer(&conn->net.uncompressed_data
TSRMLS_CC);
}
#endif
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c 2009-11-26 10:26:27 UTC (rev
291332)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c 2009-11-26 11:10:47 UTC (rev
291333)
@@ -27,6 +27,7 @@
#include "mysqlnd_result_meta.h"
#include "mysqlnd_statistics.h"
#include "mysqlnd_debug.h"
+#include "mysqlnd_block_alloc.h"
#define MYSQLND_SILENT
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h 2009-11-26 10:26:27 UTC
(rev 291332)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h 2009-11-26 11:10:47 UTC
(rev 291333)
@@ -225,7 +225,7 @@
zend_bool (*is_empty)(struct st_mysqlnd_read_buffer *);
void (*read)(struct st_mysqlnd_read_buffer *, size_t count,
zend_uchar * dest);
size_t (*bytes_left)(struct st_mysqlnd_read_buffer *);
- void (*free)(struct st_mysqlnd_read_buffer ** TSRMLS_DC);
+ void (*free_buffer)(struct st_mysqlnd_read_buffer **
TSRMLS_DC);
} MYSQLND_READ_BUFFER;
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c 2009-11-26
10:26:27 UTC (rev 291332)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c 2009-11-26
11:10:47 UTC (rev 291333)
@@ -270,7 +270,7 @@
ret->is_empty = php_mysqlnd_read_buffer_is_empty;
ret->read = php_mysqlnd_read_buffer_read;
ret->bytes_left = php_mysqlnd_read_buffer_bytes_left;
- ret->free = php_mysqlnd_read_buffer_free;
+ ret->free_buffer = php_mysqlnd_read_buffer_free;
ret->data = mnd_emalloc(count);
ret->size = ret->len = count;
ret->offset = 0;
@@ -680,7 +680,7 @@
DBG_INF_FMT("left %u to read", to_read);
if (TRUE ==
net->uncompressed_data->is_empty(net->uncompressed_data)) {
/* Everything was consumed. This should never
happen here, but for security */
-
net->uncompressed_data->free(&net->uncompressed_data TSRMLS_CC);
+
net->uncompressed_data->free_buffer(&net->uncompressed_data TSRMLS_CC);
}
}
if (to_read) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
