cvs: php4 /ext/standard file.c
| From: | Sebastian Bergmann | Date: | Tue, 30 Apr 2002 04:27:52 +0000 |
| Subject: | cvs: php4 /ext/standard file.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-11550@lists.php.net to get a copy of this message | ||
sebastian Tue Apr 30 00:27:52 2002 EDT
Modified files:
/php4/ext/standard file.c
Log:
Fix ZTS build.
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.225 php4/ext/standard/file.c:1.226
--- php4/ext/standard/file.c:1.225 Mon Apr 29 20:28:23 2002
+++ php4/ext/standard/file.c Tue Apr 30 00:27:52 2002
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.225 2002/04/30 00:28:23 wez Exp $ */
+/* $Id: file.c,v 1.226 2002/04/30 04:27:52 sebastian Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -677,7 +677,7 @@
/* given a zval which is either a stream or a context, return the underlying
* stream_context. If it is a stream that does not have a context assigned, it
* will create and assign a context and return that. */
-static php_stream_context *decode_context_param(zval *contextresource) {
+static php_stream_context *decode_context_param(zval *contextresource TSRMLS_DC) {
php_stream_context *context = NULL; void *what; int type;
what = zend_fetch_resource(&contextresource TSRMLS_CC, -1, "Stream-Context",
&type, 2, le_stream_context, le_stream);
@@ -704,7 +704,7 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zcontext) == FAILURE) {
RETURN_FALSE;
}
- context = decode_context_param(zcontext);
+ context = decode_context_param(zcontext TSRMLS_CC);
ZEND_VERIFY_RESOURCE(context);
array_init(return_value);
@@ -734,7 +734,7 @@
}
/* figure out where the context is coming from exactly */
- context = decode_context_param(zcontext);
+ context = decode_context_param(zcontext TSRMLS_CC);
ZEND_VERIFY_RESOURCE(context);
if (options) {
@@ -760,7 +760,7 @@
RETURN_FALSE;
}
- context = decode_context_param(zcontext);
+ context = decode_context_param(zcontext TSRMLS_CC);
ZEND_VERIFY_RESOURCE(context);
RETVAL_BOOL(parse_context_params(context, params) == SUCCESS);