diff options
| author | Andrey Hristov <andrey@php.net> | 2011-10-24 12:34:44 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2011-10-24 12:34:44 +0000 |
| commit | 4321da0388bf55bfa4be8d8c865ef771b08ba953 (patch) | |
| tree | 9f90e70350946db77e749837c9271021879ea178 /ext/mysqlnd/mysqlnd_net.c | |
| parent | 20422c265309993d97fc36e0e8ff0126318cc1da (diff) | |
| download | php-git-4321da0388bf55bfa4be8d8c865ef771b08ba953.tar.gz | |
move plugin specific stuff to one file. create object factory
for similar objects
Diffstat (limited to 'ext/mysqlnd/mysqlnd_net.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_net.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/ext/mysqlnd/mysqlnd_net.c b/ext/mysqlnd/mysqlnd_net.c index e36c3e8020..fb4c2f2fe5 100644 --- a/ext/mysqlnd/mysqlnd_net.c +++ b/ext/mysqlnd/mysqlnd_net.c @@ -1037,20 +1037,9 @@ MYSQLND_CLASS_METHODS_END; PHPAPI MYSQLND_NET * mysqlnd_net_init(zend_bool persistent, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info TSRMLS_DC) { - size_t alloc_size = sizeof(MYSQLND_NET) + mysqlnd_plugin_count() * sizeof(void *); - MYSQLND_NET * net = mnd_pecalloc(1, alloc_size, persistent); - + MYSQLND_NET * net; DBG_ENTER("mysqlnd_net_init"); - DBG_INF_FMT("persistent=%u", persistent); - if (net) { - net->persistent = persistent; - net->m = *mysqlnd_net_get_methods(); - - if (PASS != net->m.init(net, stats, error_info TSRMLS_CC)) { - net->m.dtor(net, stats, error_info TSRMLS_CC); - net = NULL; - } - } + net = MYSQLND_CLASS_METHOD_TABLE_NAME(mysqlnd_object_factory).get_io_channel(persistent, stats, error_info TSRMLS_CC); DBG_RETURN(net); } /* }}} */ |