cvs: php4 /ext/standard basic_functions.c
| From: | Stanislav Malyshev | Date: | Sun, 20 Aug 2000 16:09:06 +0000 |
| Subject: | cvs: php4 /ext/standard basic_functions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-1264@lists.php.net to get a copy of this message | ||
stas Sun Aug 20 09:09:06 2000 EDT
Modified files:
/php4/ext/standard basic_functions.c
Log:
Fix by-reference passing for scanf's
@- Fix by-reference parameters passing for xml_ functions and for scanf functions (Stas)
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.238 php4/ext/standard/basic_functions.c:1.239
--- php4/ext/standard/basic_functions.c:1.238 Sat Aug 19 11:01:04 2000
+++ php4/ext/standard/basic_functions.c Sun Aug 20 09:09:06 2000
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.238 2000/08/19 18:01:04 zeev Exp $ */
+/* $Id: basic_functions.c,v 1.239 2000/08/20 16:09:06 stas Exp $ */
#include "php.h"
#include "php_main.h"
@@ -64,6 +64,7 @@
static unsigned char second_args_force_ref[] = { 2, BYREF_NONE, BYREF_FORCE };
static unsigned char third_argument_force_ref[] = { 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE };
static unsigned char third_and_fourth_args_force_ref[] = { 4, BYREF_NONE, BYREF_NONE, BYREF_FORCE,
BYREF_FORCE };
+static unsigned char third_and_rest_force_ref[] = { 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE_REST };
typedef struct _php_shutdown_function_entry {
zval **arguments;
@@ -177,8 +178,8 @@
PHP_FALIAS(strchr, strstr, NULL)
PHP_NAMED_FE(sprintf, PHP_FN(user_sprintf), NULL)
PHP_NAMED_FE(printf, PHP_FN(user_printf), NULL)
- PHP_FE(sscanf, NULL)
- PHP_FE(fscanf, NULL)
+ PHP_FE(sscanf, third_and_rest_force_ref)
+ PHP_FE(fscanf, third_and_rest_force_ref)
PHP_FE(parse_url, NULL)
PHP_FE(urlencode, NULL)