svn: /php/php-src/trunk/Zend/ zend_compile.c

felipe Thu, 06 May 2010 18:20:38 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=299088 Log: - Fix error messages & WS Changed paths: U php/php-src/trunk/Zend/zend_compile.c Modified: php/php-src/trunk/Zend/zend_compile.c =================================================================== --- php/php-src/trunk/Zend/zend_compile.c 2010-05-06 17:17:45 UTC (rev 299087) +++ php/php-src/trunk/Zend/zend_compile.c 2010-05-06 18:20:38 UTC (rev 299088) @@ -3530,8 +3530,7 @@ lcname = zend_str_tolower_dup(aliases[i]->alias, lcname_len); if (zend_hash_add(target, lcname, lcname_len+1, &fn_copy, sizeof(zend_function), NULL)==FAILURE) { - zend_error(E_ERROR, "Failed to added aliased trait method (%s) to trait table. Propably there is already a trait method with same name\n", - fn_copy.common.function_name); + zend_error(E_ERROR, "Failed to added aliased trait method (%s) to trait table. Propably there is already a trait method with same name", fn_copy.common.function_name); } /* aliases[i]->function = fn_copy; */ efree(lcname); @@ -3576,8 +3575,7 @@ lcname2 = zend_str_tolower_dup(aliases[i]->alias, lcname2_len); if (zend_hash_add(target, lcname2, lcname2_len+1, &fn_copy2, sizeof(zend_function), NULL)==FAILURE) { - zend_error(E_ERROR, "Failed to added aliased trait method (%s) to trait table. Propably there is already a trait method with same name\n", - fn_copy2.common.function_name); + zend_error(E_ERROR, "Failed to added aliased trait method (%s) to trait table. Propably there is already a trait method with same name", fn_copy2.common.function_name); } efree(lcname2); } else { @@ -3595,8 +3593,7 @@ if (zend_hash_add(target, lcname, fnname_len+1, &fn_copy, sizeof(zend_function), NULL)==FAILURE) { - zend_error(E_ERROR, "Failed to added trait method (%s) to trait table. Propably there is already a trait method with same name\n", - fn_copy.common.function_name); + zend_error(E_ERROR, "Failed to added trait method (%s) to trait table. Propably there is already a trait method with same name", fn_copy.common.function_name); } } @@ -3670,8 +3667,7 @@ char* lcname = zend_str_tolower_dup(precedences[i]->trait_method->method_name, lcname_len); if (zend_hash_add(exclude_table, lcname, lcname_len, NULL, 0, NULL)==FAILURE) { - zend_error(E_ERROR, "Failed to evaluate a trait precedence (%s). Method of trait %s was defined to be excluded multiple times.\n", - precedences[i]->trait_method->method_name, trait->name); + zend_error(E_ERROR, "Failed to evaluate a trait precedence (%s). Method of trait %s was defined to be excluded multiple times", precedences[i]->trait_method->method_name, trait->name); } efree(lcname); }