Commit: 91a9569d8525d2893c83199ac83f973fb91e243b Author: Nikita Popov <ni...@php.net> Fri, 13 Sep 2013 20:01:23 +0200 Parents: 96b1c2145c2cd5e616dea191648c2d73af0239c9 Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=91a9569d8525d2893c83199ac83f973fb91e243b Log: Fix two warnings Changed paths: M Zend/zend_builtin_functions.c M Zend/zend_compile.c Diff: diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index a0fa175..ed136f5 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1388,12 +1388,11 @@ ZEND_FUNCTION(function_exists) Creates an alias for user defined class */ ZEND_FUNCTION(class_alias) { - char *class_name, *lc_name, *alias_name; + char *class_name, *alias_name; zend_class_entry **ce; int class_name_len, alias_name_len; int found; zend_bool autoload = 1; - ALLOCA_FLAG(use_heap) if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|b", &class_name, &class_name_len, &alias_name, &alias_name_len, &autoload) == FAILURE) { return; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 2dd8d03..672f62b 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3985,7 +3985,7 @@ static int zend_traits_copy_functions(zend_function *fn TSRMLS_DC, int num_args, } } - lcname = hash_key->arKey; + lcname = (char *) hash_key->arKey; if (exclude_table == NULL || zend_hash_find(exclude_table, lcname, fnname_len, &dummy) == FAILURE) { /* is not in hashtable, thus, function is not to be excluded */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
