Remove unused functions

Author: kamil-tekiela

ext/mysqli/mysqli.c

@@ -394,27 +394,6 @@ PHP_MYSQLI_EXPORT(zend_object *) mysqli_objects_new(zend_class_entry *class_type
 /* }}} */
 
 #include "ext/mysqlnd/mysqlnd_reverse_api.h"
-static MYSQLND *mysqli_convert_zv_to_mysqlnd(zval * zv)
-{
-	if (Z_TYPE_P(zv) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zv), mysqli_link_class_entry)) {
-		MY_MYSQL *mysql;
-		MYSQLI_RESOURCE  *my_res;
-		mysqli_object *intern = Z_MYSQLI_P(zv);
-		if (!(my_res = (MYSQLI_RESOURCE *)intern->ptr)) {
-			/* We know that we have a mysqli object, so this failure should be emitted */
-			zend_throw_error(NULL, "%s object is already closed", ZSTR_VAL(intern->zo.ce->name));
-			return NULL;
-		}
-		mysql = (MY_MYSQL *)(my_res->ptr);
-		return mysql ? mysql->mysql : NULL;
-	}
-	return NULL;
-}
-
-static const MYSQLND_REVERSE_API mysqli_reverse_api = {
-	&mysqli_module_entry,
-	mysqli_convert_zv_to_mysqlnd
-};
 
 static PHP_INI_MH(OnUpdateDefaultPort)
 {
@@ -538,7 +517,7 @@ PHP_MINIT_FUNCTION(mysqli)
 
 	register_mysqli_symbols(module_number);
 
-	mysqlnd_reverse_api_register_api(&mysqli_reverse_api);
+	mysqlnd_reverse_api_register_api(&mysqli_module_entry);
 
 	return SUCCESS;
 }

ext/mysqlnd/mysqlnd_reverse_api.c

@@ -42,7 +42,7 @@ mysqlnd_reverse_api_end(void)
 /* }}} */
 
 
-/* {{{ myslqnd_get_api_extensions */
+/* {{{ mysqlnd_get_api_extensions */
 PHPAPI HashTable *
 mysqlnd_reverse_api_get_api_list(void)
 {
@@ -53,29 +53,8 @@ mysqlnd_reverse_api_get_api_list(void)
 
 /* {{{ mysqlnd_reverse_api_register_api */
 PHPAPI void
-mysqlnd_reverse_api_register_api(const MYSQLND_REVERSE_API * apiext)
+mysqlnd_reverse_api_register_api(const zend_module_entry * apiext)
 {
-	zend_hash_str_add_ptr(&mysqlnd_api_ext_ht, apiext->module->name, strlen(apiext->module->name), (void*)apiext);
-}
-/* }}} */
-
-
-/* {{{ zval_to_mysqlnd */
-PHPAPI MYSQLND *
-zval_to_mysqlnd(zval * zv, const unsigned int client_api_capabilities, unsigned int * save_client_api_capabilities)
-{
-	MYSQLND_REVERSE_API *api;
-	ZEND_HASH_MAP_FOREACH_PTR(&mysqlnd_api_ext_ht, api) {
-		if (api->conversion_cb) {
-			MYSQLND *retval = api->conversion_cb(zv);
-			if (retval) {
-				if (retval->data) {
-					*save_client_api_capabilities = retval->data->m->negotiate_client_api_capabilities(retval->data, client_api_capabilities);
-				}
-				return retval;
-			}
-		}
-	} ZEND_HASH_FOREACH_END();
-	return NULL;
+	zend_hash_str_add_ptr(&mysqlnd_api_ext_ht, apiext->name, strlen(apiext->name), (void*)apiext);
 }
 /* }}} */

ext/mysqlnd/mysqlnd_reverse_api.h

@@ -16,19 +16,13 @@
 
 #ifndef MYSQLND_REVERSE_API_H
 #define MYSQLND_REVERSE_API_H
-typedef struct st_mysqlnd_reverse_api
-{
-	zend_module_entry * module;
-	MYSQLND *(*conversion_cb)(zval * zv);
-} MYSQLND_REVERSE_API;
 
 
 PHPAPI void mysqlnd_reverse_api_init(void);
 PHPAPI void mysqlnd_reverse_api_end(void);
 
 PHPAPI HashTable * mysqlnd_reverse_api_get_api_list(void);
 
-PHPAPI void mysqlnd_reverse_api_register_api(const MYSQLND_REVERSE_API * apiext);
-PHPAPI MYSQLND * zval_to_mysqlnd(zval * zv, const unsigned int client_api_capabilities, unsigned int * save_client_api_capabilities);
+PHPAPI void mysqlnd_reverse_api_register_api(const zend_module_entry * apiext);
 
 #endif	/* MYSQLND_REVERSE_API_H */

ext/mysqlnd/php_mysqlnd.c

@@ -62,13 +62,13 @@ static void
 mysqlnd_minfo_dump_api_plugins(smart_str * buffer)
 {
 	HashTable *ht = mysqlnd_reverse_api_get_api_list();
-	MYSQLND_REVERSE_API *ext;
+	zend_module_entry * ext;
 
 	ZEND_HASH_MAP_FOREACH_PTR(ht, ext) {
 		if (buffer->s) {
 			smart_str_appendc(buffer, ',');
 		}
-		smart_str_appends(buffer, ext->module->name);
+		smart_str_appends(buffer, ext->name);
 	} ZEND_HASH_FOREACH_END();
 }
 /* }}} */

ext/pdo_mysql/pdo_mysql.c

@@ -59,27 +59,6 @@ ZEND_DECLARE_MODULE_GLOBALS(pdo_mysql)
 
 #ifdef PDO_USE_MYSQLND
 #include "ext/mysqlnd/mysqlnd_reverse_api.h"
-static MYSQLND * pdo_mysql_convert_zv_to_mysqlnd(zval * zv)
-{
-	if (Z_TYPE_P(zv) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zv), php_pdo_get_dbh_ce())) {
-		pdo_dbh_t * dbh = Z_PDO_DBH_P(zv);
-
-		ZEND_ASSERT(dbh);
-
-		if (dbh->driver != &pdo_mysql_driver) {
-			php_error_docref(NULL, E_WARNING, "Provided PDO instance is not using MySQL but %s", dbh->driver->driver_name);
-			return NULL;
-		}
-
-		return ((pdo_mysql_db_handle *)dbh->driver_data)->server;
-	}
-	return NULL;
-}
-
-static const MYSQLND_REVERSE_API pdo_mysql_reverse_api = {
-	&pdo_mysql_module_entry,
-	pdo_mysql_convert_zv_to_mysqlnd
-};
 #endif
 
 /* Returns the number of SQL warnings during the execution of the last statement */
@@ -147,7 +126,7 @@ static PHP_MINIT_FUNCTION(pdo_mysql)
 #endif
 
 #ifdef PDO_USE_MYSQLND
-	mysqlnd_reverse_api_register_api(&pdo_mysql_reverse_api);
+	mysqlnd_reverse_api_register_api(&pdo_mysql_module_entry);
 #endif
 
 	pdo_mysql_ce = register_class_Pdo_Mysql(pdo_dbh_ce);