Skip to content

Commit 9d3c666

Browse files
committed
Drop some dead code
1 parent 8e8a277 commit 9d3c666

File tree

1 file changed

+3
-19
lines changed

1 file changed

+3
-19
lines changed

ext/mysqlnd/mysqlnd_reverse_api.c

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -66,25 +66,10 @@ mysqlnd_reverse_api_register_api(const MYSQLND_REVERSE_API * apiext)
6666
PHPAPI MYSQLND *
6767
zval_to_mysqlnd(zval * zv, const unsigned int client_api_capabilities, unsigned int * save_client_api_capabilities)
6868
{
69-
MYSQLND * retval;
70-
#ifdef OLD_CODE
71-
MYSQLND_REVERSE_API * elem;
72-
ZEND_HASH_FOREACH_PTR(&mysqlnd_api_ext_ht, elem) {
73-
if (elem->conversion_cb) {
74-
retval = elem->conversion_cb(zv);
75-
if (retval) {
76-
if (retval->data) {
77-
*save_client_api_capabilities = retval->data->m->negotiate_client_api_capabilities(retval->data, client_api_capabilities);
78-
}
79-
return retval;
80-
}
81-
}
82-
} ZEND_HASH_FOREACH_END();
83-
#else
84-
MYSQLND_REVERSE_API * api;
69+
MYSQLND_REVERSE_API *api;
8570
ZEND_HASH_FOREACH_PTR(&mysqlnd_api_ext_ht, api) {
86-
if (api && api->conversion_cb) {
87-
retval = api->conversion_cb(zv);
71+
if (api->conversion_cb) {
72+
MYSQLND *retval = api->conversion_cb(zv);
8873
if (retval) {
8974
if (retval->data) {
9075
*save_client_api_capabilities = retval->data->m->negotiate_client_api_capabilities(retval->data, client_api_capabilities);
@@ -93,7 +78,6 @@ zval_to_mysqlnd(zval * zv, const unsigned int client_api_capabilities, unsigned
9378
}
9479
}
9580
} ZEND_HASH_FOREACH_END();
96-
#endif
9781
return NULL;
9882
}
9983
/* }}} */

0 commit comments

Comments
 (0)