andrey Thu, 13 May 2010 14:15:23 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=299342
Log: Export the methods of MYSQLND_NET Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.h U php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c U php/php-src/trunk/ext/mysqlnd/mysqlnd_net.h Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c 2010-05-13 14:03:55 UTC (rev 299341) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c 2010-05-13 14:15:23 UTC (rev 299342) @@ -859,7 +859,23 @@ } /* }}} */ +static +MYSQLND_CLASS_METHODS_START(mysqlnd_net) + MYSQLND_METHOD(mysqlnd_net, connect), + MYSQLND_METHOD(mysqlnd_net, send), + MYSQLND_METHOD(mysqlnd_net, receive), + MYSQLND_METHOD(mysqlnd_net, set_client_option), + MYSQLND_METHOD(mysqlnd_net, network_read), + MYSQLND_METHOD(mysqlnd_net, network_write), + MYSQLND_METHOD(mysqlnd_net, decode), + MYSQLND_METHOD(mysqlnd_net, encode), + MYSQLND_METHOD(mysqlnd_net, consume_uneaten_data), + MYSQLND_METHOD(mysqlnd_net, free_contents), + MYSQLND_METHOD(mysqlnd_net, enable_ssl), + MYSQLND_METHOD(mysqlnd_net, disable_ssl) +MYSQLND_CLASS_METHODS_END; + /* {{{ mysqlnd_net_init */ PHPAPI MYSQLND_NET * mysqlnd_net_init(zend_bool persistent TSRMLS_DC) @@ -871,18 +887,7 @@ DBG_INF_FMT("persistent=%d", persistent); net->persistent = persistent; - net->m.connect = MYSQLND_METHOD(mysqlnd_net, connect); - net->m.send = MYSQLND_METHOD(mysqlnd_net, send); - net->m.receive = MYSQLND_METHOD(mysqlnd_net, receive); - net->m.set_client_option = MYSQLND_METHOD(mysqlnd_net, set_client_option); - net->m.network_read = MYSQLND_METHOD(mysqlnd_net, network_read); - net->m.network_write = MYSQLND_METHOD(mysqlnd_net, network_write); - net->m.decode = MYSQLND_METHOD(mysqlnd_net, decode); - net->m.encode = MYSQLND_METHOD(mysqlnd_net, encode); - net->m.consume_uneaten_data = MYSQLND_METHOD(mysqlnd_net, consume_uneaten_data); - net->m.free_contents = MYSQLND_METHOD(mysqlnd_net, free_contents); - net->m.enable_ssl = MYSQLND_METHOD(mysqlnd_net, enable_ssl); - net->m.disable_ssl = MYSQLND_METHOD(mysqlnd_net, disable_ssl); + net->m = mysqlnd_mysqlnd_net_methods; { unsigned int buf_size = MYSQLND_G(net_cmd_buffer_size); /* this is long, cast to unsigned int*/ @@ -937,7 +942,15 @@ /* }}} */ +/* {{{ mysqlnd_res_meta_get_methods */ +PHPAPI struct st_mysqlnd_net_methods * +mysqlnd_net_get_methods() +{ + return &mysqlnd_mysqlnd_net_methods; +} +/* }}} */ + /* * Local variables: * tab-width: 4 Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.h =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.h 2010-05-13 14:03:55 UTC (rev 299341) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.h 2010-05-13 14:15:23 UTC (rev 299342) @@ -26,6 +26,8 @@ PHPAPI MYSQLND_NET * mysqlnd_net_init(zend_bool persistent TSRMLS_DC); PHPAPI void mysqlnd_net_free(MYSQLND_NET * const net TSRMLS_DC); +PHPAPI struct st_mysqlnd_net_methods * mysqlnd_net_get_methods(); + #endif /* MYSQLND_NET_H */ /* Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c =================================================================== --- php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c 2010-05-13 14:03:55 UTC (rev 299341) +++ php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c 2010-05-13 14:15:23 UTC (rev 299342) @@ -859,7 +859,23 @@ } /* }}} */ +static +MYSQLND_CLASS_METHODS_START(mysqlnd_net) + MYSQLND_METHOD(mysqlnd_net, connect), + MYSQLND_METHOD(mysqlnd_net, send), + MYSQLND_METHOD(mysqlnd_net, receive), + MYSQLND_METHOD(mysqlnd_net, set_client_option), + MYSQLND_METHOD(mysqlnd_net, network_read), + MYSQLND_METHOD(mysqlnd_net, network_write), + MYSQLND_METHOD(mysqlnd_net, decode), + MYSQLND_METHOD(mysqlnd_net, encode), + MYSQLND_METHOD(mysqlnd_net, consume_uneaten_data), + MYSQLND_METHOD(mysqlnd_net, free_contents), + MYSQLND_METHOD(mysqlnd_net, enable_ssl), + MYSQLND_METHOD(mysqlnd_net, disable_ssl) +MYSQLND_CLASS_METHODS_END; + /* {{{ mysqlnd_net_init */ PHPAPI MYSQLND_NET * mysqlnd_net_init(zend_bool persistent TSRMLS_DC) @@ -871,18 +887,7 @@ DBG_INF_FMT("persistent=%d", persistent); net->persistent = persistent; - net->m.connect = MYSQLND_METHOD(mysqlnd_net, connect); - net->m.send = MYSQLND_METHOD(mysqlnd_net, send); - net->m.receive = MYSQLND_METHOD(mysqlnd_net, receive); - net->m.set_client_option = MYSQLND_METHOD(mysqlnd_net, set_client_option); - net->m.network_read = MYSQLND_METHOD(mysqlnd_net, network_read); - net->m.network_write = MYSQLND_METHOD(mysqlnd_net, network_write); - net->m.decode = MYSQLND_METHOD(mysqlnd_net, decode); - net->m.encode = MYSQLND_METHOD(mysqlnd_net, encode); - net->m.consume_uneaten_data = MYSQLND_METHOD(mysqlnd_net, consume_uneaten_data); - net->m.free_contents = MYSQLND_METHOD(mysqlnd_net, free_contents); - net->m.enable_ssl = MYSQLND_METHOD(mysqlnd_net, enable_ssl); - net->m.disable_ssl = MYSQLND_METHOD(mysqlnd_net, disable_ssl); + net->m = mysqlnd_mysqlnd_net_methods; { unsigned int buf_size = MYSQLND_G(net_cmd_buffer_size); /* this is long, cast to unsigned int*/ @@ -937,7 +942,15 @@ /* }}} */ +/* {{{ mysqlnd_res_meta_get_methods */ +PHPAPI struct st_mysqlnd_net_methods * +mysqlnd_net_get_methods() +{ + return &mysqlnd_mysqlnd_net_methods; +} +/* }}} */ + /* * Local variables: * tab-width: 4 Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_net.h =================================================================== --- php/php-src/trunk/ext/mysqlnd/mysqlnd_net.h 2010-05-13 14:03:55 UTC (rev 299341) +++ php/php-src/trunk/ext/mysqlnd/mysqlnd_net.h 2010-05-13 14:15:23 UTC (rev 299342) @@ -26,6 +26,8 @@ PHPAPI MYSQLND_NET * mysqlnd_net_init(zend_bool persistent TSRMLS_DC); PHPAPI void mysqlnd_net_free(MYSQLND_NET * const net TSRMLS_DC); +PHPAPI struct st_mysqlnd_net_methods * mysqlnd_net_get_methods(); + #endif /* MYSQLND_NET_H */ /*
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php