[PHP-CVS] cvs: php-src(PHP_5_2) /ext/filter callback_filter.c

[Antony Dovgal]

tony2001                Wed Jul 19 08:35:55 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/filter callback_filter.c 
  Log:
  no need to fetch name and free it immediately after that
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/callback_filter.c?r1=1.9&r2=1.9.2.1&diff_format=u
Index: php-src/ext/filter/callback_filter.c
diff -u php-src/ext/filter/callback_filter.c:1.9 
php-src/ext/filter/callback_filter.c:1.9.2.1
--- php-src/ext/filter/callback_filter.c:1.9    Sat Jan 14 15:10:54 2006
+++ php-src/ext/filter/callback_filter.c        Wed Jul 19 08:35:55 2006
@@ -16,27 +16,22 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: callback_filter.c,v 1.9 2006/01/14 15:10:54 sniper Exp $ */
+/* $Id: callback_filter.c,v 1.9.2.1 2006/07/19 08:35:55 tony2001 Exp $ */
 
 #include "php_filter.h"
 
 void php_filter_callback(PHP_INPUT_FILTER_PARAM_DECL)
 {
-       char *name = NULL;
        zval *retval_ptr;
        zval ***args;
        int status;
 
-       if (!option_array || !zend_is_callable(option_array, 
IS_CALLABLE_CHECK_NO_ACCESS, &name)) {
+       if (!option_array || !zend_is_callable(option_array, 
IS_CALLABLE_CHECK_NO_ACCESS, NULL)) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "First argument is 
expected to be a valid callback");
-               if (name) {
-                       efree(name);
-               }
                zval_dtor(value);
                Z_TYPE_P(value) = IS_NULL;
                return;
        }
-       efree(name);
 
        args = safe_emalloc(sizeof(zval **), 1, 0);
        args[0] = &value;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php