[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard basic_functions.c

[Sara Golemon]

pollita         Wed Aug 11 00:10:45 2004 EDT

  Modified files:              (Branch: PHP_5_0)
    /php-src/ext/standard       basic_functions.c 
  Log:
  MFH: $errmsg should have been forced reference
  
http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.c?r1=1.673.2.1&r2=1.673.2.2&ty=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.673.2.1 
php-src/ext/standard/basic_functions.c:1.673.2.2
--- php-src/ext/standard/basic_functions.c:1.673.2.1    Fri Jul 30 10:24:59 2004
+++ php-src/ext/standard/basic_functions.c      Wed Aug 11 00:10:44 2004
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: basic_functions.c,v 1.673.2.1 2004/07/30 14:24:59 wez Exp $ */
+/* $Id: basic_functions.c,v 1.673.2.2 2004/08/11 04:10:44 pollita Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -479,7 +479,7 @@
        PHP_FALIAS(show_source,                 highlight_file,                        
                         NULL)
        PHP_FE(highlight_string,                                                       
                                         NULL)
        PHP_FE(php_strip_whitespace,                                                   
                                         NULL)
-       PHP_FE(php_check_syntax,                                                       
                                         NULL)
+       PHP_FE(php_check_syntax,                                                       
                                         second_arg_force_ref)
 
        PHP_FE(ini_get,                                                                
                                                 NULL)
        PHP_FE(ini_get_all,                                                            
                                                 NULL)
@@ -2336,10 +2336,10 @@
        PG(log_errors) = PG(display_errors) = 0;
 
        if (php_lint_script(&file_handle TSRMLS_CC) != SUCCESS) {
-               if (errm && PZVAL_IS_REF(errm)) {
+               if (errm) {
                        char *error_str;
 
-                       convert_to_string_ex(&errm);
+                       zval_dtor(errm);
                        spprintf(&error_str, 0, "%s in %s on line %d", 
PG(last_error_message), PG(last_error_file), PG(last_error_lineno));
                        ZVAL_STRING(errm, error_str, 0);
                }

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