[PHP-CVS] cvs: php-src /ext/standard type.c

[Andrei Zmievski]

andrei          Fri Oct  6 20:11:25 2006 UTC

  Modified files:              
    /php-src/ext/standard       type.c 
  Log:
  Unicode support in is_callable().
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/type.c?r1=1.44&r2=1.45&diff_format=u
Index: php-src/ext/standard/type.c
diff -u php-src/ext/standard/type.c:1.44 php-src/ext/standard/type.c:1.45
--- php-src/ext/standard/type.c:1.44    Mon Sep 25 01:37:55 2006
+++ php-src/ext/standard/type.c Fri Oct  6 20:11:25 2006
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: type.c,v 1.44 2006/09/25 01:37:55 pollita Exp $ */
+/* $Id: type.c,v 1.45 2006/10/06 20:11:25 andrei Exp $ */
 
 #include "php.h"
 #include "php_incomplete_class.h"
@@ -441,31 +441,25 @@
 }
 /* }}} */
 
-/* {{{ proto bool is_callable(mixed var [, bool syntax_only [, string 
callable_name]]) 
+/* {{{ proto bool is_callable(mixed var [, bool syntax_only [, string 
callable_name]])  U
    Returns true if var is callable. */
 PHP_FUNCTION(is_callable)
 {
-       zval **var, **syntax_only, **callable_name;
+       zval *var, **callable_name;
        zval name;
        zend_bool retval;
-       zend_bool syntax = 0;
-       int argc=ZEND_NUM_ARGS();
+       zend_bool syntax_only = 0;
 
-       if (argc < 1 || argc > 3 || zend_get_parameters_ex(argc, &var, 
&syntax_only, &callable_name) == FAILURE) {
-               WRONG_PARAM_COUNT;
-       }
-
-       if (argc > 1) {
-               convert_to_boolean_ex(syntax_only);
-               syntax = Z_BVAL_PP(syntax_only);
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|bZ", &var,
+                                                         &syntax_only, 
&callable_name) == FAILURE) {
+               return;
        }
 
-       if (argc > 2) {
-               retval = zend_is_callable(*var, syntax, &name);
-               zval_dtor(*callable_name);
-               **callable_name = name;
+       if (ZEND_NUM_ARGS() > 2) {
+               retval = zend_is_callable(var, syntax_only, &name);
+               REPLACE_ZVAL_VALUE(callable_name, &name, 0);
        } else {
-               retval = zend_is_callable(*var, syntax, NULL);
+               retval = zend_is_callable(var, syntax_only, NULL);
        }
 
        RETURN_BOOL(retval);

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