cvs: php4 /ext/standard php_fopen_wrapper.c
| From: | Hartmut Holzgraefe | Date: | Mon, 21 Oct 2002 19:08:19 +0000 |
| Subject: | cvs: php4 /ext/standard php_fopen_wrapper.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-15115@lists.php.net to get a copy of this message | ||
hholzgra Mon Oct 21 15:08:19 2002 EDT
Modified files:
/php4/ext/standard php_fopen_wrapper.c
Log:
killed some warnings identified by sebastian
Index: php4/ext/standard/php_fopen_wrapper.c
diff -u php4/ext/standard/php_fopen_wrapper.c:1.27 php4/ext/standard/php_fopen_wrapper.c:1.28
--- php4/ext/standard/php_fopen_wrapper.c:1.27 Mon Oct 21 12:41:06 2002
+++ php4/ext/standard/php_fopen_wrapper.c Mon Oct 21 15:08:18 2002
@@ -17,7 +17,7 @@
| Hartmut Holzgraefe <hholzgra@php.net> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_fopen_wrapper.c,v 1.27 2002/10/21 16:41:06 hholzgra Exp $ */
+/* $Id: php_fopen_wrapper.c,v 1.28 2002/10/21 19:08:18 hholzgra Exp $ */
#include <stdio.h>
#include <stdlib.h>
@@ -73,7 +73,7 @@
static size_t php_stream_input_read(php_stream *stream, char *buf, size_t count TSRMLS_DC)
{
- int read_bytes;
+ size_t read_bytes = 0;
if(!stream->eof) {
if(SG(request_info).post_data) { /* data has already been read by a post handler */
read_bytes = SG(request_info).post_data_length - stream->position;
@@ -85,16 +85,16 @@
if(read_bytes) {
memcpy(buf, SG(request_info).post_data + stream->position, read_bytes);
}
- return read_bytes;
} else {
read_bytes = sapi_module.read_post(buf, count TSRMLS_CC);
if(read_bytes <= 0){
stream->eof = 1;
read_bytes = 0;
}
- return read_bytes;
}
}
+
+ return read_bytes;
}
static int php_stream_input_close(php_stream *stream, int close_handle TSRMLS_DC)