andrey Thu, 13 May 2010 11:16:11 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=299337
Log:
Export the result_metadata methods to external modules.
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result_meta.c
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result_meta.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_result_meta.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_result_meta.h
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result_meta.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result_meta.c
2010-05-13 11:06:00 UTC (rev 299336)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result_meta.c
2010-05-13 11:16:11 UTC (rev 299337)
@@ -150,6 +150,9 @@
DBG_ENTER("mysqlnd_res_meta::read_metadata");
field_packet =
conn->protocol->m.get_result_field_packet(conn->protocol, FALSE TSRMLS_CC);
+ if (!field_packet) {
+ DBG_RETURN(FAIL);
+ }
field_packet->persistent_alloc = meta->persistent;
for (;i < meta->field_count; i++) {
long idx;
@@ -423,6 +426,7 @@
/* }}} */
+static
MYSQLND_CLASS_METHODS_START(mysqlnd_res_meta)
MYSQLND_METHOD(mysqlnd_res_meta, fetch_field),
MYSQLND_METHOD(mysqlnd_res_meta, fetch_field_direct),
@@ -455,6 +459,15 @@
}
+/* {{{ mysqlnd_res_meta_get_methods */
+PHPAPI struct st_mysqlnd_res_meta_methods *
+mysqlnd_result_metadata_get_methods()
+{
+ return &mysqlnd_mysqlnd_res_meta_methods;
+}
+/* }}} */
+
+
/*
* Local variables:
* tab-width: 4
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result_meta.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result_meta.h
2010-05-13 11:06:00 UTC (rev 299336)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result_meta.h
2010-05-13 11:16:11 UTC (rev 299337)
@@ -24,6 +24,7 @@
#define MYSQLND_RESULT_META_H
PHPAPI MYSQLND_RES_METADATA * mysqlnd_result_meta_init(unsigned int
field_count, zend_bool persistent TSRMLS_DC);
+PHPAPI struct st_mysqlnd_res_meta_methods *
mysqlnd_result_metadata_get_methods();
#endif /* MYSQLND_RESULT_META_H */
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_result_meta.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_result_meta.c 2010-05-13 11:06:00 UTC
(rev 299336)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_result_meta.c 2010-05-13 11:16:11 UTC
(rev 299337)
@@ -150,6 +150,9 @@
DBG_ENTER("mysqlnd_res_meta::read_metadata");
field_packet =
conn->protocol->m.get_result_field_packet(conn->protocol, FALSE TSRMLS_CC);
+ if (!field_packet) {
+ DBG_RETURN(FAIL);
+ }
field_packet->persistent_alloc = meta->persistent;
for (;i < meta->field_count; i++) {
long idx;
@@ -423,6 +426,7 @@
/* }}} */
+static
MYSQLND_CLASS_METHODS_START(mysqlnd_res_meta)
MYSQLND_METHOD(mysqlnd_res_meta, fetch_field),
MYSQLND_METHOD(mysqlnd_res_meta, fetch_field_direct),
@@ -455,6 +459,15 @@
}
+/* {{{ mysqlnd_res_meta_get_methods */
+PHPAPI struct st_mysqlnd_res_meta_methods *
+mysqlnd_result_metadata_get_methods()
+{
+ return &mysqlnd_mysqlnd_res_meta_methods;
+}
+/* }}} */
+
+
/*
* Local variables:
* tab-width: 4
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_result_meta.h
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_result_meta.h 2010-05-13 11:06:00 UTC
(rev 299336)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_result_meta.h 2010-05-13 11:16:11 UTC
(rev 299337)
@@ -24,6 +24,7 @@
#define MYSQLND_RESULT_META_H
PHPAPI MYSQLND_RES_METADATA * mysqlnd_result_meta_init(unsigned int
field_count, zend_bool persistent TSRMLS_DC);
+PHPAPI struct st_mysqlnd_res_meta_methods *
mysqlnd_result_metadata_get_methods();
#endif /* MYSQLND_RESULT_META_H */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
