iliaa Tue Jan 21 09:56:42 2003 EDT
Modified files:
/php4/sapi/apache php_apache.c
/php4/sapi/apache_hooks php_apache.c
Log:
ARG_COUNT(ht) -> ZEND_NUM_ARGS().
Index: php4/sapi/apache/php_apache.c
diff -u php4/sapi/apache/php_apache.c:1.76 php4/sapi/apache/php_apache.c:1.77
--- php4/sapi/apache/php_apache.c:1.76 Sat Jan 18 15:27:04 2003
+++ php4/sapi/apache/php_apache.c Tue Jan 21 09:56:36 2003
@@ -17,7 +17,7 @@
| David Sklar <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.c,v 1.76 2003/01/18 20:27:04 iliaa Exp $ */
+/* $Id: php_apache.c,v 1.77 2003/01/21 14:56:36 iliaa Exp $ */
#include "php_apache_http.h"
@@ -136,7 +136,7 @@
{
pval **arg_name, **arg_val;
char *note_val;
- int arg_count = ARG_COUNT(ht);
+ int arg_count = ZEND_NUM_ARGS();
if (arg_count<1 || arg_count>2 ||
zend_get_parameters_ex(arg_count, &arg_name, &arg_val) ==FAILURE ) {
@@ -303,7 +303,7 @@
pval **filename;
request_rec *rr = NULL;
- if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) {
+ if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_string_ex(filename);
@@ -410,7 +410,7 @@
pval **filename;
request_rec *rr=NULL;
- if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) {
+ if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_string_ex(filename);
@@ -485,7 +485,7 @@
request_rec *rr=NULL;
TSRMLS_FETCH();
- if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) {
+ if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_string_ex(filename);
Index: php4/sapi/apache_hooks/php_apache.c
diff -u php4/sapi/apache_hooks/php_apache.c:1.9
php4/sapi/apache_hooks/php_apache.c:1.10
--- php4/sapi/apache_hooks/php_apache.c:1.9 Sat Jan 18 15:27:05 2003
+++ php4/sapi/apache_hooks/php_apache.c Tue Jan 21 09:56:40 2003
@@ -17,7 +17,7 @@
| David Sklar <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.c,v 1.9 2003/01/18 20:27:05 iliaa Exp $ */
+/* $Id: php_apache.c,v 1.10 2003/01/21 14:56:40 iliaa Exp $ */
#include "php_apache_http.h"
@@ -1029,7 +1029,7 @@
request_rec *r;
int rec;
- switch(ARG_COUNT(ht)) {
+ switch(ZEND_NUM_ARGS()) {
case 0:
rec = 0;
break;
@@ -1054,7 +1054,7 @@
zval *id;
request_rec *r;
- if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &length) == FAILURE) {
+ if(ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &length) == FAILURE) {
WRONG_PARAM_COUNT;
}
APREQ_GET_REQUEST(id, r);
@@ -1091,7 +1091,7 @@
zval *id;
request_rec *r;
- if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &buffer) == FAILURE) {
+ if(ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &buffer) == FAILURE) {
WRONG_PARAM_COUNT;
}
APREQ_GET_REQUEST(id, r);
@@ -1134,7 +1134,7 @@
request_rec *r;
int facility = APLOG_ERR;
- switch(ARG_COUNT(ht)) {
+ switch(ZEND_NUM_ARGS()) {
case 1:
if(zend_get_parameters_ex(1, &z_errstr) == FAILURE) {
RETURN_FALSE;
@@ -1168,7 +1168,7 @@
zval *id;
zval **file;
request_rec *r, *sub_r;
- if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &file) == FAILURE) {
+ if(ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &file) == FAILURE) {
WRONG_PARAM_COUNT;
}
APREQ_GET_REQUEST(id, r);
@@ -1191,7 +1191,7 @@
zval **file;
request_rec *r, *sub_r;
- if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &file) == FAILURE) {
+ if(ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &file) == FAILURE) {
WRONG_PARAM_COUNT;
}
APREQ_GET_REQUEST(id, r);
@@ -1214,7 +1214,7 @@
zval **file, **method;
request_rec *r, *sub_r;
- if(ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &method, &file) == FAILURE) {
+ if(ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &method, &file) == FAILURE) {
WRONG_PARAM_COUNT;
}
APREQ_GET_REQUEST(id, r);
@@ -1253,7 +1253,7 @@
zval **new_uri;
request_rec *r;
- if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &new_uri) == FAILURE) {
+ if(ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &new_uri) == FAILURE) {
WRONG_PARAM_COUNT;
}
APREQ_GET_REQUEST(id, r);
@@ -1268,7 +1268,7 @@
zval *id;
request_rec *r;
- if(ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &fieldname, &fieldval) ==
FAILURE) {
+ if(ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &fieldname, &fieldval) ==
+FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_string_ex(fieldname);
@@ -1547,7 +1547,7 @@
{
zval **arg_name, **arg_val;
char *note_val;
- int arg_count = ARG_COUNT(ht);
+ int arg_count = ZEND_NUM_ARGS();
if (arg_count<1 || arg_count>2 ||
zend_get_parameters_ex(arg_count, &arg_name, &arg_val) ==FAILURE ) {
@@ -1714,7 +1714,7 @@
pval **filename;
request_rec *rr = NULL;
- if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) {
+ if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_string_ex(filename);
@@ -1821,7 +1821,7 @@
pval **filename;
request_rec *rr=NULL;
- if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) {
+ if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_string_ex(filename);
@@ -1896,7 +1896,7 @@
request_rec *rr=NULL;
TSRMLS_FETCH();
- if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) {
+ if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_string_ex(filename);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
