cvs: php-src(PHP_5_1) /main/streams memory.c

helly Fri Oct 7 03:38:59 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/main/streams memory.c Log: - MFH C vs. C++ fix http://cvs.php.net/diff.php/php-src/main/streams/memory.c?r1=1.8.2.1&r2=1.8.2.2&ty=u Index: php-src/main/streams/memory.c diff -u php-src/main/streams/memory.c:1.8.2.1 php-src/main/streams/memory.c:1.8.2.2 --- php-src/main/streams/memory.c:1.8.2.1 Thu Oct 6 17:31:25 2005 +++ php-src/main/streams/memory.c Fri Oct 7 03:38:59 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: memory.c,v 1.8.2.1 2005/10/06 21:31:25 helly Exp $ */ +/* $Id: memory.c,v 1.8.2.2 2005/10/07 07:38:59 helly Exp $ */ #define _GNU_SOURCE #include "php.h" @@ -308,12 +308,13 @@ static size_t php_stream_temp_read(php_stream *stream, char *buf, size_t count TSRMLS_DC) { php_stream_temp_data *ts; + size_t got; assert(stream != NULL); ts = stream->abstract; assert(ts != NULL); - size_t got = php_stream_read(ts->innerstream, buf, count); + got = php_stream_read(ts->innerstream, buf, count); if (!got) { stream->eof |= ts->innerstream->eof;