[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard streamsfuncs.c

[Antony Dovgal]

tony2001                Mon Apr 14 07:49:00 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/standard       streamsfuncs.c 
  Log:
  fix ZTS build and sync with HEAD
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.15.2.11&r2=1.58.2.6.2.15.2.12&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.11 
php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.12
--- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.11      Sun Apr 13 
22:35:27 2008
+++ php-src/ext/standard/streamsfuncs.c Mon Apr 14 07:49:00 2008
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.11 2008/04/13 22:35:27 bjori Exp $ */
+/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.12 2008/04/14 07:49:00 tony2001 Exp $ 
*/
 
 #include "php.h"
 #include "php_globals.h"
@@ -850,7 +850,7 @@
        }
 }
 
-static int parse_context_options(php_stream_context *context, zval *options)
+static int parse_context_options(php_stream_context *context, zval *options 
TSRMLS_DC)
 {
        HashPosition pos, opos;
        zval **wval, **oval;
@@ -874,7 +874,7 @@
                        }
 
                } else {
-                       zend_error(E_WARNING, "options should have the form 
[\"wrappername\"][\"optionname\"] = $value");
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "options 
should have the form [\"wrappername\"][\"optionname\"] = $value");
                }
                zend_hash_move_forward_ex(Z_ARRVAL_P(options), &pos);
        }
@@ -882,7 +882,7 @@
        return ret;
 }
 
-static int parse_context_params(php_stream_context *context, zval *params)
+static int parse_context_params(php_stream_context *context, zval *params 
TSRMLS_DC)
 {
        int ret = SUCCESS;
        zval **tmp;
@@ -902,7 +902,7 @@
        }
        if (SUCCESS == zend_hash_find(Z_ARRVAL_P(params), "options", 
sizeof("options"), (void**)&tmp)) {
                if (Z_TYPE_PP(tmp) == IS_ARRAY) {
-                       parse_context_options(context, *tmp);
+                       parse_context_options(context, *tmp TSRMLS_CC);
                } else {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid 
stream/context parameter");
                }
@@ -988,7 +988,7 @@
 
        if (options) {
                /* handle the array syntax */
-               RETVAL_BOOL(parse_context_options(context, options) == SUCCESS);
+               RETVAL_BOOL(parse_context_options(context, options TSRMLS_CC) 
== SUCCESS);
        } else {
                php_stream_context_set_option(context, wrappername, optionname, 
zvalue);
                RETVAL_TRUE;
@@ -1013,7 +1013,7 @@
                RETURN_FALSE;
        }
 
-       RETVAL_BOOL(parse_context_params(context, params) == SUCCESS);
+       RETVAL_BOOL(parse_context_params(context, params TSRMLS_CC) == SUCCESS);
 }
 /* }}} */
 
@@ -1034,7 +1034,7 @@
        context = FG(default_context);
        
        if (params) {
-               parse_context_options(context, params);
+               parse_context_options(context, params TSRMLS_CC);
        }
        
        php_stream_context_to_zval(context, return_value);
@@ -1055,7 +1055,7 @@
        context = php_stream_context_alloc();
        
        if (params) {
-               parse_context_options(context, params);
+               parse_context_options(context, params TSRMLS_CC);
        }
        
        php_stream_context_to_zval(context, return_value);



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