[PHP-CVS] cvs: php-src /main/streams streams.c

[Sara Golemon]

pollita         Tue Mar 21 18:28:42 2006 UTC

  Modified files:              
    /php-src/main/streams       streams.c 
  Log:
  Allow grow_mode && !bufstart (original assertion logic)
  
  
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/streams.c?r1=1.107&r2=1.108&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.107 
php-src/main/streams/streams.c:1.108
--- php-src/main/streams/streams.c:1.107        Sat Mar 18 19:44:51 2006
+++ php-src/main/streams/streams.c      Tue Mar 21 18:28:42 2006
@@ -19,7 +19,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: streams.c,v 1.107 2006/03/18 19:44:51 helly Exp $ */
+/* $Id: streams.c,v 1.108 2006/03/21 18:28:42 pollita Exp $ */
 
 #define _GNU_SOURCE
 #include "php.h"
@@ -1112,7 +1112,8 @@
        }
 
        if (total_copied == 0) {
-               assert(bufstart.v != NULL || !grow_mode || stream->eof);
+               assert(stream->eof || !grow_mode ||
+                               (grow_mode && bufstart.v == NULL));
                return NULL;
        }
 
@@ -1122,10 +1123,6 @@
                buf.s[0] = 0;
        }
 
-       if (returned_len) {
-               *returned_len = total_copied;
-       }
-
        return bufstart.s;
 }
 

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