andrey Fri, 02 Sep 2011 11:22:41 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=316035
Log:
function rename to comply with the schema of other callbacks
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c
U php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_ps.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
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 2011-09-02
11:06:51 UTC (rev 316034)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c 2011-09-02
11:22:41 UTC (rev 316035)
@@ -41,7 +41,7 @@
/* Exported by mysqlnd_ps_codec.c */
enum_func_status mysqlnd_stmt_execute_generate_request(MYSQLND_STMT * const s,
zend_uchar ** request, size_t *request_len, zend_bool * free_buffer TSRMLS_DC);
-enum_func_status mysqlnd_fetch_stmt_row_buffered(MYSQLND_RES *result, void
*param,
+enum_func_status mysqlnd_stmt_fetch_row_buffered(MYSQLND_RES *result, void
*param,
unsigned int flags,
zend_bool *fetched_anything TSRMLS_DC);
@@ -97,7 +97,7 @@
result = stmt->result;
result->type = MYSQLND_RES_PS_BUF;
- result->m.fetch_row = mysqlnd_fetch_stmt_row_buffered;
+ result->m.fetch_row = mysqlnd_stmt_fetch_row_buffered;
result->m.fetch_lengths = NULL;/* makes no sense */
result->result_set_memory_pool =
mysqlnd_mempool_create(MYSQLND_G(mempool_default_size) TSRMLS_CC);
@@ -724,16 +724,16 @@
/* }}} */
-/* {{{ mysqlnd_fetch_stmt_row_buffered */
+/* {{{ mysqlnd_stmt_fetch_row_buffered */
enum_func_status
-mysqlnd_fetch_stmt_row_buffered(MYSQLND_RES *result, void *param, unsigned int
flags, zend_bool *fetched_anything TSRMLS_DC)
+mysqlnd_stmt_fetch_row_buffered(MYSQLND_RES *result, void *param, unsigned int
flags, zend_bool *fetched_anything TSRMLS_DC)
{
MYSQLND_STMT * s = (MYSQLND_STMT *) param;
MYSQLND_STMT_DATA * stmt = s? s->data:NULL;
MYSQLND_RES_BUFFERED *set = result->stored_data;
unsigned int field_count = result->meta->field_count;
- DBG_ENTER("mysqlnd_fetch_stmt_row_buffered");
+ DBG_ENTER("mysqlnd_stmt_fetch_row_buffered");
*fetched_anything = FALSE;
DBG_INF_FMT("stmt=%lu", stmt != NULL ? stmt->stmt_id : 0L);
Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_ps.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_ps.c 2011-09-02
11:06:51 UTC (rev 316034)
+++ php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_ps.c 2011-09-02
11:22:41 UTC (rev 316035)
@@ -41,7 +41,7 @@
/* Exported by mysqlnd_ps_codec.c */
enum_func_status mysqlnd_stmt_execute_generate_request(MYSQLND_STMT * const s,
zend_uchar ** request, size_t *request_len, zend_bool * free_buffer TSRMLS_DC);
-enum_func_status mysqlnd_fetch_stmt_row_buffered(MYSQLND_RES *result, void
*param,
+enum_func_status mysqlnd_stmt_fetch_row_buffered(MYSQLND_RES *result, void
*param,
unsigned int flags,
zend_bool *fetched_anything TSRMLS_DC);
@@ -112,7 +112,7 @@
result = stmt->result;
result->type = MYSQLND_RES_PS_BUF;
- result->m.fetch_row = mysqlnd_fetch_stmt_row_buffered;
+ result->m.fetch_row = mysqlnd_stmt_fetch_row_buffered;
result->m.fetch_lengths = NULL;/* makes no sense */
result->m.row_decoder = php_mysqlnd_rowp_read_binary_protocol;
@@ -720,16 +720,16 @@
/* }}} */
-/* {{{ mysqlnd_fetch_stmt_row_buffered */
+/* {{{ mysqlnd_stmt_fetch_row_buffered */
enum_func_status
-mysqlnd_fetch_stmt_row_buffered(MYSQLND_RES *result, void *param, unsigned int
flags, zend_bool *fetched_anything TSRMLS_DC)
+mysqlnd_stmt_fetch_row_buffered(MYSQLND_RES *result, void *param, unsigned int
flags, zend_bool *fetched_anything TSRMLS_DC)
{
MYSQLND_STMT * s = (MYSQLND_STMT *) param;
MYSQLND_STMT_DATA * stmt = s? s->data:NULL;
MYSQLND_RES_BUFFERED *set = result->stored_data;
unsigned int field_count = result->meta->field_count;
- DBG_ENTER("mysqlnd_fetch_stmt_row_buffered");
+ DBG_ENTER("mysqlnd_stmt_fetch_row_buffered");
*fetched_anything = FALSE;
DBG_INF_FMT("stmt=%lu", stmt != NULL ? stmt->stmt_id : 0L);
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c 2011-09-02 11:06:51 UTC (rev
316034)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c 2011-09-02 11:22:41 UTC (rev
316035)
@@ -41,7 +41,7 @@
/* Exported by mysqlnd_ps_codec.c */
enum_func_status mysqlnd_stmt_execute_generate_request(MYSQLND_STMT * const s,
zend_uchar ** request, size_t *request_len, zend_bool * free_buffer TSRMLS_DC);
-enum_func_status mysqlnd_fetch_stmt_row_buffered(MYSQLND_RES *result, void
*param,
+enum_func_status mysqlnd_stmt_fetch_row_buffered(MYSQLND_RES *result, void
*param,
unsigned int flags,
zend_bool *fetched_anything TSRMLS_DC);
@@ -112,7 +112,7 @@
result = stmt->result;
result->type = MYSQLND_RES_PS_BUF;
- result->m.fetch_row = mysqlnd_fetch_stmt_row_buffered;
+ result->m.fetch_row = mysqlnd_stmt_fetch_row_buffered;
result->m.fetch_lengths = NULL;/* makes no sense */
result->m.row_decoder = php_mysqlnd_rowp_read_binary_protocol;
@@ -720,16 +720,16 @@
/* }}} */
-/* {{{ mysqlnd_fetch_stmt_row_buffered */
+/* {{{ mysqlnd_stmt_fetch_row_buffered */
enum_func_status
-mysqlnd_fetch_stmt_row_buffered(MYSQLND_RES *result, void *param, unsigned int
flags, zend_bool *fetched_anything TSRMLS_DC)
+mysqlnd_stmt_fetch_row_buffered(MYSQLND_RES *result, void *param, unsigned int
flags, zend_bool *fetched_anything TSRMLS_DC)
{
MYSQLND_STMT * s = (MYSQLND_STMT *) param;
MYSQLND_STMT_DATA * stmt = s? s->data:NULL;
MYSQLND_RES_BUFFERED *set = result->stored_data;
unsigned int field_count = result->meta->field_count;
- DBG_ENTER("mysqlnd_fetch_stmt_row_buffered");
+ DBG_ENTER("mysqlnd_stmt_fetch_row_buffered");
*fetched_anything = FALSE;
DBG_INF_FMT("stmt=%lu", stmt != NULL ? stmt->stmt_id : 0L);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
