bjori Fri Jun 30 18:16:50 2006 UTC
Modified files:
/php-src/ext/standard basic_functions.c
Log:
Do not force pass by-ref, these functions only prefer by-ref
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.785&r2=1.786&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.785
php-src/ext/standard/basic_functions.c:1.786
--- php-src/ext/standard/basic_functions.c:1.785 Tue Jun 27 22:14:07 2006
+++ php-src/ext/standard/basic_functions.c Fri Jun 30 18:16:50 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.785 2006/06/27 22:14:07 bjori Exp $ */
+/* $Id: basic_functions.c,v 1.786 2006/06/30 18:16:50 bjori Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -309,12 +309,12 @@
static
ZEND_BEGIN_ARG_INFO(arginfo_current, ZEND_SEND_PREFER_REF)
- ZEND_ARG_INFO(1, arg)
+ ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, arg)
ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO(arginfo_key, ZEND_SEND_PREFER_REF)
- ZEND_ARG_INFO(1, arg)
+ ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, arg)
ZEND_END_ARG_INFO()
static
@@ -607,12 +607,12 @@
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_array_multisort, ZEND_SEND_PREFER_REF, 0, 1)
- ZEND_ARG_INFO(1, arr1) /* ARRAY_INFO(0, arg1, 0) */
- ZEND_ARG_INFO(1, SORT_ASC_or_SORT_DESC)
- ZEND_ARG_INFO(1, SORT_REGULAR_or_SORT_NUMERIC_or_SORT_STRING)
- ZEND_ARG_INFO(1, arr2)
- ZEND_ARG_INFO(1, SORT_ASC_or_SORT_DESC)
- ZEND_ARG_INFO(1, SORT_REGULAR_or_SORT_NUMERIC_or_SORT_STRING)
+ ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, arr1) /* ARRAY_INFO(0, arg1, 0) */
+ ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, SORT_ASC_or_SORT_DESC)
+ ZEND_ARG_INFO(ZEND_SEND_PREFER_REF,
SORT_REGULAR_or_SORT_NUMERIC_or_SORT_STRING)
+ ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, arr2)
+ ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, SORT_ASC_or_SORT_DESC)
+ ZEND_ARG_INFO(ZEND_SEND_PREFER_REF,
SORT_REGULAR_or_SORT_NUMERIC_or_SORT_STRING)
ZEND_END_ARG_INFO()
static
@@ -654,8 +654,8 @@
static
ZEND_BEGIN_ARG_INFO(arginfo_array_key_exists, ZEND_SEND_PREFER_REF)
- ZEND_ARG_INFO(0, key)
- ZEND_ARG_INFO(1, search)
+ ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, key)
+ ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, search)
ZEND_END_ARG_INFO()
static
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
