cvs: php4 /ext/standard php_fopen_wrapper.c /main user_streams.c
| From: | Wez Furlong | Date: | Thu, 11 Apr 2002 12:13:17 +0000 |
| Subject: | cvs: php4 /ext/standard php_fopen_wrapper.c /main user_streams.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-11033@lists.php.net to get a copy of this message | ||
wez Thu Apr 11 08:13:17 2002 EDT
Modified files:
/php4/ext/standard php_fopen_wrapper.c
/php4/main user_streams.c
Log:
Fix declarations (Thanks Sebastian)
Index: php4/ext/standard/php_fopen_wrapper.c
diff -u php4/ext/standard/php_fopen_wrapper.c:1.19 php4/ext/standard/php_fopen_wrapper.c:1.20
--- php4/ext/standard/php_fopen_wrapper.c:1.19 Wed Apr 10 18:42:24 2002
+++ php4/ext/standard/php_fopen_wrapper.c Thu Apr 11 08:13:15 2002
@@ -17,7 +17,7 @@
| Hartmut Holzgraefe <hholzgra@php.net> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_fopen_wrapper.c,v 1.19 2002/04/10 22:42:24 wez Exp $ */
+/* $Id: php_fopen_wrapper.c,v 1.20 2002/04/11 12:13:15 wez Exp $ */
#include <stdio.h>
#include <stdlib.h>
@@ -30,7 +30,7 @@
#include "php_standard.h"
#include "php_fopen_wrappers.h"
-php_stream * php_stream_url_wrap_php(php_stream_wrapper *wrapper, char *path, char *mode, int
options, char **opened_path, php_stream_wrapper_options *exoptions STREAMS_DC TSRMLS_DC)
+php_stream * php_stream_url_wrap_php(php_stream_wrapper *wrapper, char *path, char *mode, int
options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC)
{
FILE * fp = NULL;
php_stream * stream = NULL;
Index: php4/main/user_streams.c
diff -u php4/main/user_streams.c:1.11 php4/main/user_streams.c:1.12
--- php4/main/user_streams.c:1.11 Wed Apr 10 18:42:30 2002
+++ php4/main/user_streams.c Thu Apr 11 08:13:17 2002
@@ -29,7 +29,7 @@
php_stream_wrapper wrapper;
};
-static php_stream *user_wrapper_opener(php_stream_wrapper *wrapper, char *filename, char *mode, int
options, char **opened_path, php_stream_wrapper_options *exoptions STREAMS_DC TSRMLS_DC);
+static php_stream *user_wrapper_opener(php_stream_wrapper *wrapper, char *filename, char *mode, int
options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC);
static php_stream_wrapper_ops user_stream_wops = {
user_wrapper_opener,
@@ -115,7 +115,7 @@
* */
-static php_stream *user_wrapper_opener(php_stream_wrapper *wrapper, char *filename, char *mode, int
options, char **opened_path, php_stream_wrapper_options *exoptions STREAMS_DC TSRMLS_DC)
+static php_stream *user_wrapper_opener(php_stream_wrapper *wrapper, char *filename, char *mode, int
options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC)
{
struct php_user_stream_wrapper *uwrap = (struct php_user_stream_wrapper*)wrapper->abstract;
php_userstream_data_t *us;