[PHP-CVS] cvs: php4 /main user_streams.c

[Wez Furlong]

wez             Sun Oct 13 20:16:02 2002 EDT

  Modified files:              
    /php4/main  user_streams.c 
  Log:
  Fix stream_eof result interpretation (and thus the user-streams test).
  
  
Index: php4/main/user_streams.c
diff -u php4/main/user_streams.c:1.26 php4/main/user_streams.c:1.27
--- php4/main/user_streams.c:1.26       Sat Oct  5 06:35:13 2002
+++ php4/main/user_streams.c    Sun Oct 13 20:16:02 2002
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: user_streams.c,v 1.26 2002/10/05 10:35:13 wez Exp $ */
+/* $Id: user_streams.c,v 1.27 2002/10/14 00:16:02 wez Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -477,11 +477,12 @@
                        &retval,
                        0, NULL, 0, NULL TSRMLS_CC);
 
-       if (!(call_result == SUCCESS && retval != NULL && zval_is_true(retval))) {
-               if (call_result == FAILURE) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::" 
USERSTREAM_EOF " is not implemented! Assuming EOF",
-                                       us->wrapper->classname);
-               }
+       if (call_result == SUCCESS && retval != NULL && zval_is_true(retval)) {
+               stream->eof = 1;
+       } else if (call_result == FAILURE) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                               "%s::" USERSTREAM_EOF " is not implemented! Assuming 
+EOF",
+                               us->wrapper->classname);
 
                stream->eof = 1;
        }



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