andrey Fri, 14 May 2010 13:32:27 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=299379
Log:
Export MYSQLND_PROTOCOL methods
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.h
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
2010-05-14 13:18:39 UTC (rev 299378)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
2010-05-14 13:32:27 UTC (rev 299379)
@@ -2045,6 +2045,22 @@
/* }}} */
+static
+MYSQLND_CLASS_METHODS_START(mysqlnd_protocol)
+ MYSQLND_METHOD(mysqlnd_protocol, get_greet_packet),
+ MYSQLND_METHOD(mysqlnd_protocol, get_auth_packet),
+ MYSQLND_METHOD(mysqlnd_protocol, get_ok_packet),
+ MYSQLND_METHOD(mysqlnd_protocol, get_command_packet),
+ MYSQLND_METHOD(mysqlnd_protocol, get_eof_packet),
+ MYSQLND_METHOD(mysqlnd_protocol, get_rset_header_packet),
+ MYSQLND_METHOD(mysqlnd_protocol, get_result_field_packet),
+ MYSQLND_METHOD(mysqlnd_protocol, get_row_packet),
+ MYSQLND_METHOD(mysqlnd_protocol, get_stats_packet),
+ MYSQLND_METHOD(mysqlnd_protocol, get_prepare_response_packet),
+ MYSQLND_METHOD(mysqlnd_protocol, get_change_user_response_packet)
+MYSQLND_CLASS_METHODS_END;
+
+
/* {{{ mysqlnd_protocol_init */
PHPAPI MYSQLND_PROTOCOL *
mysqlnd_protocol_init(zend_bool persistent TSRMLS_DC)
@@ -2056,17 +2072,7 @@
DBG_INF_FMT("persistent=%d", persistent);
ret->persistent = persistent;
- ret->m.get_greet_packet = MYSQLND_METHOD(mysqlnd_protocol,
get_greet_packet);
- ret->m.get_auth_packet = MYSQLND_METHOD(mysqlnd_protocol,
get_auth_packet);
- ret->m.get_ok_packet = MYSQLND_METHOD(mysqlnd_protocol, get_ok_packet);
- ret->m.get_command_packet = MYSQLND_METHOD(mysqlnd_protocol,
get_command_packet);
- ret->m.get_eof_packet = MYSQLND_METHOD(mysqlnd_protocol,
get_eof_packet);
- ret->m.get_rset_header_packet = MYSQLND_METHOD(mysqlnd_protocol,
get_rset_header_packet);
- ret->m.get_result_field_packet = MYSQLND_METHOD(mysqlnd_protocol,
get_result_field_packet);
- ret->m.get_row_packet = MYSQLND_METHOD(mysqlnd_protocol,
get_row_packet);
- ret->m.get_stats_packet = MYSQLND_METHOD(mysqlnd_protocol,
get_stats_packet);
- ret->m.get_prepare_response_packet = MYSQLND_METHOD(mysqlnd_protocol,
get_prepare_response_packet);
- ret->m.get_change_user_response_packet =
MYSQLND_METHOD(mysqlnd_protocol, get_change_user_response_packet);
+ ret->m = mysqlnd_mysqlnd_protocol_methods;
DBG_RETURN(ret);
}
@@ -2103,6 +2109,15 @@
/* }}} */
+/* {{{ mysqlnd_protocol_get_methods */
+PHPAPI struct st_mysqlnd_protocol_methods *
+mysqlnd_protocol_get_methods()
+{
+ return &mysqlnd_mysqlnd_protocol_methods;
+}
+/* }}} */
+
+
/*
* Local variables:
* tab-width: 4
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.h
2010-05-14 13:18:39 UTC (rev 299378)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.h
2010-05-14 13:32:27 UTC (rev 299379)
@@ -273,8 +273,8 @@
PHPAPI MYSQLND_PROTOCOL * mysqlnd_protocol_init(zend_bool persistent
TSRMLS_DC);
PHPAPI void mysqlnd_protocol_free(MYSQLND_PROTOCOL * const protocol TSRMLS_DC);
+PHPAPI struct st_mysqlnd_protocol_methods * mysqlnd_protocol_get_methods();
-
#endif /* MYSQLND_WIREPROTOCOL_H */
/*
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c 2010-05-14
13:18:39 UTC (rev 299378)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c 2010-05-14
13:32:27 UTC (rev 299379)
@@ -2045,6 +2045,22 @@
/* }}} */
+static
+MYSQLND_CLASS_METHODS_START(mysqlnd_protocol)
+ MYSQLND_METHOD(mysqlnd_protocol, get_greet_packet),
+ MYSQLND_METHOD(mysqlnd_protocol, get_auth_packet),
+ MYSQLND_METHOD(mysqlnd_protocol, get_ok_packet),
+ MYSQLND_METHOD(mysqlnd_protocol, get_command_packet),
+ MYSQLND_METHOD(mysqlnd_protocol, get_eof_packet),
+ MYSQLND_METHOD(mysqlnd_protocol, get_rset_header_packet),
+ MYSQLND_METHOD(mysqlnd_protocol, get_result_field_packet),
+ MYSQLND_METHOD(mysqlnd_protocol, get_row_packet),
+ MYSQLND_METHOD(mysqlnd_protocol, get_stats_packet),
+ MYSQLND_METHOD(mysqlnd_protocol, get_prepare_response_packet),
+ MYSQLND_METHOD(mysqlnd_protocol, get_change_user_response_packet)
+MYSQLND_CLASS_METHODS_END;
+
+
/* {{{ mysqlnd_protocol_init */
PHPAPI MYSQLND_PROTOCOL *
mysqlnd_protocol_init(zend_bool persistent TSRMLS_DC)
@@ -2056,17 +2072,7 @@
DBG_INF_FMT("persistent=%d", persistent);
ret->persistent = persistent;
- ret->m.get_greet_packet = MYSQLND_METHOD(mysqlnd_protocol,
get_greet_packet);
- ret->m.get_auth_packet = MYSQLND_METHOD(mysqlnd_protocol,
get_auth_packet);
- ret->m.get_ok_packet = MYSQLND_METHOD(mysqlnd_protocol, get_ok_packet);
- ret->m.get_command_packet = MYSQLND_METHOD(mysqlnd_protocol,
get_command_packet);
- ret->m.get_eof_packet = MYSQLND_METHOD(mysqlnd_protocol,
get_eof_packet);
- ret->m.get_rset_header_packet = MYSQLND_METHOD(mysqlnd_protocol,
get_rset_header_packet);
- ret->m.get_result_field_packet = MYSQLND_METHOD(mysqlnd_protocol,
get_result_field_packet);
- ret->m.get_row_packet = MYSQLND_METHOD(mysqlnd_protocol,
get_row_packet);
- ret->m.get_stats_packet = MYSQLND_METHOD(mysqlnd_protocol,
get_stats_packet);
- ret->m.get_prepare_response_packet = MYSQLND_METHOD(mysqlnd_protocol,
get_prepare_response_packet);
- ret->m.get_change_user_response_packet =
MYSQLND_METHOD(mysqlnd_protocol, get_change_user_response_packet);
+ ret->m = mysqlnd_mysqlnd_protocol_methods;
DBG_RETURN(ret);
}
@@ -2103,6 +2109,15 @@
/* }}} */
+/* {{{ mysqlnd_protocol_get_methods */
+PHPAPI struct st_mysqlnd_protocol_methods *
+mysqlnd_protocol_get_methods()
+{
+ return &mysqlnd_mysqlnd_protocol_methods;
+}
+/* }}} */
+
+
/*
* Local variables:
* tab-width: 4
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.h
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.h 2010-05-14
13:18:39 UTC (rev 299378)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.h 2010-05-14
13:32:27 UTC (rev 299379)
@@ -273,8 +273,8 @@
PHPAPI MYSQLND_PROTOCOL * mysqlnd_protocol_init(zend_bool persistent
TSRMLS_DC);
PHPAPI void mysqlnd_protocol_free(MYSQLND_PROTOCOL * const protocol TSRMLS_DC);
+PHPAPI struct st_mysqlnd_protocol_methods * mysqlnd_protocol_get_methods();
-
#endif /* MYSQLND_WIREPROTOCOL_H */
/*
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
