iliaa Tue Jan 21 09:53:18 2003 EDT
Modified files:
/php4/ext/fbsql php_fbsql.c
/php4/ext/mbstring mbstring.c
/php4/ext/standard array.c basic_functions.c file.c string.c
Log:
ARG_COUNT(ht) -> ZEND_NUM_ARGS().
Index: php4/ext/fbsql/php_fbsql.c
diff -u php4/ext/fbsql/php_fbsql.c:1.89 php4/ext/fbsql/php_fbsql.c:1.90
--- php4/ext/fbsql/php_fbsql.c:1.89 Sat Jan 18 14:49:22 2003
+++ php4/ext/fbsql/php_fbsql.c Tue Jan 21 09:53:15 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_fbsql.c,v 1.89 2003/01/18 19:49:22 iliaa Exp $ */
+/* $Id: php_fbsql.c,v 1.90 2003/01/21 14:53:15 iliaa Exp $ */
/* TODO:
*
@@ -2160,7 +2160,7 @@
Enable or disable FrontBase warnings */
PHP_FUNCTION(fbsql_warnings)
{
- int argc = ARG_COUNT(ht);
+ int argc = ZEND_NUM_ARGS();
zval **argv[1];
if ((argc < 0) || (argc > 1)) WRONG_PARAM_COUNT;
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.154 php4/ext/mbstring/mbstring.c:1.155
--- php4/ext/mbstring/mbstring.c:1.154 Sat Jan 18 15:09:29 2003
+++ php4/ext/mbstring/mbstring.c Tue Jan 21 09:53:16 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.154 2003/01/18 20:09:29 iliaa Exp $ */
+/* $Id: mbstring.c,v 1.155 2003/01/21 14:53:16 iliaa Exp $ */
/*
* PHP4 Multibyte String module "mbstring"
@@ -1008,7 +1008,7 @@
retname = 1;
if (ZEND_NUM_ARGS() == 0) {
result = MBSTRG(http_input_identify);
- } else if (ARG_COUNT(ht) == 1 && zend_get_parameters_ex(1, &arg1) != FAILURE) {
+ } else if (ZEND_NUM_ARGS() == 1 && zend_get_parameters_ex(1, &arg1) !=
+FAILURE) {
convert_to_string_ex(arg1);
switch (*(Z_STRVAL_PP(arg1))) {
case 'G':
Index: php4/ext/standard/array.c
diff -u php4/ext/standard/array.c:1.215 php4/ext/standard/array.c:1.216
--- php4/ext/standard/array.c:1.215 Mon Jan 13 13:12:23 2003
+++ php4/ext/standard/array.c Tue Jan 21 09:53:16 2003
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.215 2003/01/13 18:12:23 andrey Exp $ */
+/* $Id: array.c,v 1.216 2003/01/21 14:53:16 iliaa Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -2625,7 +2625,7 @@
Bucket ***lists, **list, ***ptrs, *p;
/* Get the argument count and check it */
- argc = ARG_COUNT(ht);
+ argc = ZEND_NUM_ARGS();
if (argc < 2) {
WRONG_PARAM_COUNT;
}
@@ -2773,7 +2773,7 @@
Bucket ***lists, **list, ***ptrs, *p;
/* Get the argument count and check it */
- argc = ARG_COUNT(ht);
+ argc = ZEND_NUM_ARGS();
if (argc < 2) {
WRONG_PARAM_COUNT;
}
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.564
php4/ext/standard/basic_functions.c:1.565
--- php4/ext/standard/basic_functions.c:1.564 Sun Jan 19 07:18:46 2003
+++ php4/ext/standard/basic_functions.c Tue Jan 21 09:53:16 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.564 2003/01/19 12:18:46 phanto Exp $ */
+/* $Id: basic_functions.c,v 1.565 2003/01/21 14:53:16 iliaa Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -2890,7 +2890,7 @@
zend_file_handle fh;
zend_ini_parser_cb_t ini_parser_cb;
- switch (ARG_COUNT(ht)) {
+ switch (ZEND_NUM_ARGS()) {
case 1:
if (zend_get_parameters_ex(1, &filename) == FAILURE) {
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.295 php4/ext/standard/file.c:1.296
--- php4/ext/standard/file.c:1.295 Sat Jan 18 15:01:41 2003
+++ php4/ext/standard/file.c Tue Jan 21 09:53:17 2003
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.295 2003/01/18 20:01:41 iliaa Exp $ */
+/* $Id: file.c,v 1.296 2003/01/21 14:53:17 iliaa Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1233,7 +1233,7 @@
zval **arg1;
php_stream *stream;
- if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) {
+ if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) {
WRONG_PARAM_COUNT;
}
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.348 php4/ext/standard/string.c:1.349
--- php4/ext/standard/string.c:1.348 Sun Jan 19 06:32:54 2003
+++ php4/ext/standard/string.c Tue Jan 21 09:53:17 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.348 2003/01/19 11:32:54 moriyoshi Exp $ */
+/* $Id: string.c,v 1.349 2003/01/21 14:53:17 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -3391,7 +3391,7 @@
int argCount;
int old_rg;
- argCount = ARG_COUNT(ht);
+ argCount = ZEND_NUM_ARGS();
if (argCount < 1 || argCount > 2 || zend_get_parameters_ex(argCount, &arg,
&arrayArg) == FAILURE) {
WRONG_PARAM_COUNT;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
