diff options
| author | Andrey Hristov <andrey@php.net> | 2015-10-02 15:30:53 +0200 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2015-11-12 16:19:16 +0100 |
| commit | 34a33928d649c69859c6b368f5fa35a8d37d7b2c (patch) | |
| tree | 14a115afe44e8bc2ca7679fea31b91eb6d1eedf8 /ext/mysqlnd/mysqlnd_driver.c | |
| parent | 4c83582c74f1a553e19635d0b2880d5120fde5ef (diff) | |
| download | php-git-34a33928d649c69859c6b368f5fa35a8d37d7b2c.tar.gz | |
MNDR:
- Rename MYSQLND_PROTOCOL to MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY
- Rename other symbols related to MYSQLND_PROTOCOL accordingly
Diffstat (limited to 'ext/mysqlnd/mysqlnd_driver.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_driver.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/mysqlnd/mysqlnd_driver.c b/ext/mysqlnd/mysqlnd_driver.c index 628e02659d..11cbb70c53 100644 --- a/ext/mysqlnd/mysqlnd_driver.c +++ b/ext/mysqlnd/mysqlnd_driver.c @@ -282,18 +282,18 @@ MYSQLND_METHOD(mysqlnd_object_factory, get_io_channel)(zend_bool persistent, MYS /* }}} */ -/* {{{ mysqlnd_object_factory::get_protocol_decoder */ -static MYSQLND_PROTOCOL * -MYSQLND_METHOD(mysqlnd_object_factory, get_protocol_decoder)(zend_bool persistent) +/* {{{ mysqlnd_object_factory::get_protocol_payload_decoder_factory */ +static MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * +MYSQLND_METHOD(mysqlnd_object_factory, get_protocol_payload_decoder_factory)(zend_bool persistent) { - size_t alloc_size = sizeof(MYSQLND_PROTOCOL) + mysqlnd_plugin_count() * sizeof(void *); - MYSQLND_PROTOCOL *ret = mnd_pecalloc(1, alloc_size, persistent); + size_t alloc_size = sizeof(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY) + mysqlnd_plugin_count() * sizeof(void *); + MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY *ret = mnd_pecalloc(1, alloc_size, persistent); - DBG_ENTER("mysqlnd_object_factory::get_protocol_decoder"); + DBG_ENTER("mysqlnd_object_factory::get_protocol_payload_decoder_factory"); DBG_INF_FMT("persistent=%u", persistent); if (ret) { ret->persistent = persistent; - ret->m = mysqlnd_mysqlnd_protocol_methods; + ret->m = MYSQLND_CLASS_METHOD_TABLE_NAME(mysqlnd_protocol_payload_decoder_factory); } DBG_RETURN(ret); @@ -306,7 +306,7 @@ PHPAPI MYSQLND_CLASS_METHODS_START(mysqlnd_object_factory) MYSQLND_METHOD(mysqlnd_object_factory, clone_connection_object), MYSQLND_METHOD(mysqlnd_object_factory, get_prepared_statement), MYSQLND_METHOD(mysqlnd_object_factory, get_io_channel), - MYSQLND_METHOD(mysqlnd_object_factory, get_protocol_decoder) + MYSQLND_METHOD(mysqlnd_object_factory, get_protocol_payload_decoder_factory) MYSQLND_CLASS_METHODS_END; /* |