From faf465929542928b83b2e4d557cad293e4047321 Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Fri, 14 May 2010 13:32:27 +0000 Subject: [PATCH] Export MYSQLND_PROTOCOL methods --- ext/mysqlnd/mysqlnd_wireprotocol.c | 37 +++++++++++++++++++++--------- ext/mysqlnd/mysqlnd_wireprotocol.h | 2 +- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index 5b1bca906e..08d470c9fa 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -2045,6 +2045,22 @@ MYSQLND_METHOD(mysqlnd_protocol, get_change_user_response_packet)(MYSQLND_PROTOC /* }}} */ +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 @@ mysqlnd_protocol_init(zend_bool persistent TSRMLS_DC) 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_plugin_get_plugin_protocol_data(const MYSQLND_PROTOCOL * protocol, unsi /* }}} */ +/* {{{ mysqlnd_protocol_get_methods */ +PHPAPI struct st_mysqlnd_protocol_methods * +mysqlnd_protocol_get_methods() +{ + return &mysqlnd_mysqlnd_protocol_methods; +} +/* }}} */ + + /* * Local variables: * tab-width: 4 diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.h b/ext/mysqlnd/mysqlnd_wireprotocol.h index 64dc5528a6..192129678c 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.h +++ b/ext/mysqlnd/mysqlnd_wireprotocol.h @@ -273,7 +273,7 @@ void php_mysqlnd_rowp_read_text_protocol(MYSQLND_MEMORY_POOL_CHUNK * row_buffer, 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 */ -- 2.40.0