[PHP-CVS] cvs: php4 /ext/standard basic_functions.c

[Marcus B�rger]

helly           Fri Oct  4 13:17:01 2002 EDT

  Modified files:              
    /php4/ext/standard  basic_functions.c 
  Log:
  return FALSE on error
  
  
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.522 
php4/ext/standard/basic_functions.c:1.523
--- php4/ext/standard/basic_functions.c:1.522   Thu Oct  3 09:31:59 2002
+++ php4/ext/standard/basic_functions.c Fri Oct  4 13:17:01 2002
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: basic_functions.c,v 1.522 2002/10/03 13:31:59 yohgaki Exp $ */
+/* $Id: basic_functions.c,v 1.523 2002/10/04 17:17:01 helly Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -1377,7 +1377,7 @@
        
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
                                                          &options, &options_len) == 
FAILURE) {
-               return;
+               RETURN_FALSE;
        }
 
        /*
@@ -2031,7 +2031,7 @@
        zend_bool i = 0;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|b", &filename, &i) == 
FAILURE) {
-               return;
+               RETURN_FALSE;
        }
        convert_to_string(filename);
 
@@ -2072,7 +2072,7 @@
        zend_bool  i = 0;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|b", &expr, &i) == 
FAILURE) {
-               return;
+               RETURN_FALSE;
        }
        convert_to_string(expr);
 
@@ -2170,7 +2170,7 @@
        zend_module_entry *module;
        
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &extname, 
&extname_len) == FAILURE) {
-               return;
+               RETURN_FALSE;
        }
 
        zend_ini_sort_entries(TSRMLS_C);
@@ -2274,7 +2274,7 @@
        zend_bool i = 0;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|b", &var, &i) == 
FAILURE) {
-               return;
+               RETURN_FALSE;
        }
        
        if (i) {
@@ -2409,7 +2409,7 @@
        if (ent == NULL) {
                Z_LVAL_P(return_value) = -1;
                Z_TYPE_P(return_value) = IS_LONG;
-               return;
+               RETURN_FALSE;
        }
 
        RETURN_LONG(ent->p_proto);
@@ -2696,7 +2696,7 @@
        fh.handle.fp = VCWD_FOPEN(Z_STRVAL_PP(filename), "r");
        if (!fh.handle.fp) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot open '%s' for 
reading", Z_STRVAL_PP(filename));
-               return;
+               RETURN_FALSE;
        }
        Z_TYPE(fh) = ZEND_HANDLE_FP;
        fh.filename = Z_STRVAL_PP(filename);



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