Remove my_estrdup() and my_efree() macros

Replace the single use of my_efree().

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index a25bc096ce4b8ab994168904eb978854e66e90ff..f74df1facb4cfb505a93faa4119ef4521843b11d 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -200,7 +200,9 @@ static void mysqli_objects_free_storage(zend_object *object)
        mysqli_object   *intern = php_mysqli_fetch_object(object);
        MYSQLI_RESOURCE *my_res = (MYSQLI_RESOURCE *)intern->ptr;
 
-       my_efree(my_res);
+       if (my_res) {
+               efree(my_res);
+       }
        zend_object_std_dtor(&intern->zo);
 }
 /* }}} */

diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h
index 1b7ffddb1a5bdd7b5b12f6966c72d74642947232..964bb56db3584f3a108e73777d05db12aa33c3e5 100644 (file)
--- a/ext/mysqli/php_mysqli_structs.h
+++ b/ext/mysqli/php_mysqli_structs.h
@@ -342,9 +342,6 @@ ZEND_END_MODULE_GLOBALS(mysqli)
 ZEND_TSRMLS_CACHE_EXTERN()
 #endif
 
-#define my_estrdup(x) (x) ? estrdup(x) : NULL
-#define my_efree(x) if (x) efree(x)
-
 ZEND_EXTERN_MODULE_GLOBALS(mysqli)
 
 #endif /* PHP_MYSQLI_STRUCTS.H */