cvs: /php4/ext/apache apache.c /php4/ext/aspell aspell.c /php4/ext/cybercash cybercash.c /php4/ext/dba dba.c /php4/ext/fdf fdf.c /php4/ext/gettext
gettext.c /php4/ext/hyperwave hw.c /php4/ext/ldap ldap.c /php4/ext/mcrypt mcrypt.c /php4/ext/mhash mhash.c /php4/ext/mssql php_mssql.c /php4/ext/mysql
php_mysql.c /php4/ext/oci8 oci8.c /php4/ext/odbc php_odbc.c /php4/ext/oracle oracle.c /php4/ext/pcre php_pcre.c /php4/ext/pdf pdf.c /php4/ext/readline
readline.c /php4/ext/session session.c /php4/ext/standard array.c assert.c base64.c basic_functions.c crypt.c dir.c dl.c dns.c file.c
formatted_print.c html.c image.c info.c iptc.c link.c mail.c math.c md5.c metaphone.c microtime.c rand.c reg.c soundex.c string.c syslog.c uniqid.c
url.c var.c /php4/ext/sysvsem sysvsem.c /php4/ext/sysvshm sysvshm.c /php4/ext/wddx wddx.c /php4/ext/xml xml.c /php4/ext/yp yp.c /php4/ext/zlib zlib.c

zeev Sat Dec 18 17:36:08 1999 EDT Modified files: /php4/ext/apache apache.c /php4/ext/aspell aspell.c /php4/ext/cybercash cybercash.c /php4/ext/dba dba.c /php4/ext/fdf fdf.c /php4/ext/gettext gettext.c /php4/ext/hyperwave hw.c /php4/ext/ldap ldap.c /php4/ext/mcrypt mcrypt.c /php4/ext/mhash mhash.c /php4/ext/mssql php_mssql.c /php4/ext/mysql php_mysql.c /php4/ext/oci8 oci8.c /php4/ext/odbc php_odbc.c /php4/ext/oracle oracle.c /php4/ext/pcre php_pcre.c /php4/ext/pdf pdf.c /php4/ext/readline readline.c /php4/ext/session session.c /php4/ext/standard array.c assert.c base64.c basic_functions.c crypt.c dir.c dl.c dns.c file.c formatted_print.c html.c image.c info.c iptc.c link.c mail.c math.c md5.c metaphone.c microtime.c rand.c reg.c soundex.c string.c syslog.c uniqid.c url.c var.c /php4/ext/sysvsem sysvsem.c /php4/ext/sysvshm sysvshm.c /php4/ext/wddx wddx.c /php4/ext/xml xml.c /php4/ext/yp yp.c /php4/ext/zlib zlib.c Log: - The tree compiles again Index: php4/ext/apache/apache.c diff -u php4/ext/apache/apache.c:1.23 php4/ext/apache/apache.c:1.24 --- php4/ext/apache/apache.c:1.23 Fri Dec 17 15:54:43 1999 +++ php4/ext/apache/apache.c Sat Dec 18 17:34:54 1999 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: apache.c,v 1.23 1999/12/17 20:54:43 zeev Exp $ */ +/* $Id: apache.c,v 1.24 1999/12/18 22:34:54 zeev Exp $ */ #include "php.h" #include "ext/standard/head.h" #include "php_globals.h" @@ -127,7 +127,7 @@ SLS_FETCH(); if (arg_count<1 || arg_count>2 || - getParametersEx(arg_count,&arg_name,&arg_val) ==FAILURE ) { + zend_get_parameters_ex(arg_count,&arg_name,&arg_val) ==FAILURE ) { WRONG_PARAM_COUNT; } @@ -278,7 +278,7 @@ request_rec *rr = NULL; SLS_FETCH(); - if (ARG_COUNT(ht) != 1 || getParametersEx(1,&filename) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1,&filename) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(filename); @@ -351,7 +351,7 @@ request_rec *rr=NULL; SLS_FETCH(); - if (ARG_COUNT(ht) != 1 || getParametersEx(1,&filename) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1,&filename) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(filename); @@ -425,7 +425,7 @@ request_rec *rr=NULL; SLS_FETCH(); - if (ARG_COUNT(ht) != 1 || getParametersEx(1,&filename) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1,&filename) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(filename); Index: php4/ext/aspell/aspell.c diff -u php4/ext/aspell/aspell.c:1.10 php4/ext/aspell/aspell.c:1.11 --- php4/ext/aspell/aspell.c:1.10 Fri Dec 17 16:13:13 1999 +++ php4/ext/aspell/aspell.c Sat Dec 18 17:34:57 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: aspell.c,v 1.10 1999/12/17 21:13:13 zeev Exp $ */ +/* $Id: aspell.c,v 1.11 1999/12/18 22:34:57 zeev Exp $ */ #include "php.h" #if defined(COMPILE_DL) @@ -78,7 +78,7 @@ int ind; argc = ARG_COUNT(ht); - if (argc < 1 || argc > 2 || getParametersEx(argc,&master,&personal) == FAILURE) { + if (argc < 1 || argc > 2 || zend_get_parameters_ex(argc,&master,&personal) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(master); @@ -109,7 +109,7 @@ argc = ARG_COUNT(ht); - if (argc != 2 || getParametersEx(argc, &scin,&word) == FAILURE) { + if (argc != 2 || zend_get_parameters_ex(argc, &scin,&word) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(scin); @@ -143,7 +143,7 @@ int argc; argc = ARG_COUNT(ht); - if (argc != 2 || getParametersEx(argc, &scin,&word) == FAILURE) { + if (argc != 2 || zend_get_parameters_ex(argc, &scin,&word) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(scin); @@ -175,7 +175,7 @@ aspell *sc; argc = ARG_COUNT(ht); - if (argc != 2 || getParametersEx(argc, &scin,&word) == FAILURE) { + if (argc != 2 || zend_get_parameters_ex(argc, &scin,&word) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(scin); Index: php4/ext/cybercash/cybercash.c diff -u php4/ext/cybercash/cybercash.c:1.2 php4/ext/cybercash/cybercash.c:1.3 --- php4/ext/cybercash/cybercash.c:1.2 Mon Dec 6 20:41:25 1999 +++ php4/ext/cybercash/cybercash.c Sat Dec 18 17:34:57 1999 @@ -59,7 +59,7 @@ unsigned int outAlloc, outLth; long errcode; - if(ARG_COUNT(ht) != 3 || getParametersEx(3,&wmk,&sk,&inbuff) == FAILURE) { + if(ARG_COUNT(ht) != 3 || zend_get_parameters_ex(3,&wmk,&sk,&inbuff) == FAILURE) { WRONG_PARAM_COUNT; } @@ -105,7 +105,7 @@ long errcode; - if(ARG_COUNT(ht) != 3 || getParametersEx(3,&wmk,&sk,&inbuff) == FAILURE) + if(ARG_COUNT(ht) != 3 || zend_get_parameters_ex(3,&wmk,&sk,&inbuff) == FAILURE) { WRONG_PARAM_COUNT; } @@ -151,7 +151,7 @@ long ret_length; if(ARG_COUNT(ht) != 1 || - getParametersEx(1,&inbuff) == FAILURE) + zend_get_parameters_ex(1,&inbuff) == FAILURE) { WRONG_PARAM_COUNT; } @@ -177,7 +177,7 @@ long ret_length; if(ARG_COUNT(ht) != 1 || - getParametersEx(1,&inbuff) == FAILURE) + zend_get_parameters_ex(1,&inbuff) == FAILURE) { WRONG_PARAM_COUNT; } Index: php4/ext/dba/dba.c diff -u php4/ext/dba/dba.c:1.10 php4/ext/dba/dba.c:1.11 --- php4/ext/dba/dba.c:1.10 Fri Dec 17 16:34:23 1999 +++ php4/ext/dba/dba.c Sat Dec 18 17:34:58 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba.c,v 1.10 1999/12/17 21:34:23 zeev Exp $ */ +/* $Id: dba.c,v 1.11 1999/12/18 22:34:58 zeev Exp $ */ #include "php.h" @@ -95,13 +95,13 @@ /* these are used to get the standard arguments */ #define DBA_GET1 \ - if(ac != 1 || getParametersEx(ac, &id) != SUCCESS) { \ + if(ac != 1 || zend_get_parameters_ex(ac, &id) != SUCCESS) { \ WRONG_PARAM_COUNT; \ } #define DBA_GET2 \ pval **key; \ - if(ac != 2 || getParametersEx(ac, &key, &id) != SUCCESS) { \ + if(ac != 2 || zend_get_parameters_ex(ac, &key, &id) != SUCCESS) { \ WRONG_PARAM_COUNT; \ } \ convert_to_string_ex(key) @@ -199,7 +199,7 @@ { dba_handler *hptr; - PUTS("V1 ($Id: dba.c,v 1.10 1999/12/17 21:34:23 zeev Exp $)"); + PUTS("V1 ($Id: dba.c,v 1.11 1999/12/18 22:34:58 zeev Exp $)"); for(hptr = handler; hptr->name; hptr++) { PUTS(" "); PUTS(hptr->name); @@ -211,7 +211,7 @@ DBA_ID_PARS; pval **val, **key; - if(ac != 3 || getParametersEx(ac, &key, &val, &id) != SUCCESS) { + if(ac != 3 || zend_get_parameters_ex(ac, &key, &val, &id) != SUCCESS) { WRONG_PARAM_COUNT; } convert_to_string_ex(key); @@ -245,7 +245,7 @@ /* we pass additional args to the respective handler */ args = emalloc(ac * sizeof(pval *)); - if(getParametersArrayEx(ac, args) != SUCCESS) { + if(zend_get_parameters_array_ex(ac, args) != SUCCESS) { FREENOW; WRONG_PARAM_COUNT; } Index: php4/ext/fdf/fdf.c diff -u php4/ext/fdf/fdf.c:1.14 php4/ext/fdf/fdf.c:1.15 --- php4/ext/fdf/fdf.c:1.14 Fri Dec 17 15:54:54 1999 +++ php4/ext/fdf/fdf.c Sat Dec 18 17:34:59 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fdf.c,v 1.14 1999/12/17 20:54:54 zeev Exp $ */ +/* $Id: fdf.c,v 1.15 1999/12/18 22:34:59 zeev Exp $ */ /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from http://beta1.adobe.com/ada/acrosdk/forms.html. */ @@ -129,7 +129,7 @@ FDF_TLS_VARS; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &file) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &file) == FAILURE) { WRONG_PARAM_COUNT; } @@ -153,7 +153,7 @@ FDFDoc fdf; FDF_TLS_VARS; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } @@ -201,7 +201,7 @@ FDFErc err; FDF_TLS_VARS; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } @@ -242,7 +242,7 @@ FDFErc err; FDF_TLS_VARS; - if (ARG_COUNT(ht) != 4 || getParametersEx(4, &arg1, &arg2,&arg3, &arg4) == FAILURE) { + if (ARG_COUNT(ht) != 4 || zend_get_parameters_ex(4, &arg1, &arg2,&arg3, &arg4) == FAILURE) { WRONG_PARAM_COUNT; } @@ -280,7 +280,7 @@ if((argc > 2) || (argc < 1)) WRONG_PARAM_COUNT; - if (getParametersArrayEx(argc, argv) == FAILURE) { + if (zend_get_parameters_array_ex(argc, argv) == FAILURE) { WRONG_PARAM_COUNT; } @@ -323,7 +323,7 @@ FDFAppFace face; FDF_TLS_VARS; - if (ARG_COUNT(ht) != 5 || getParametersEx(5, &arg1, &arg2,&arg3, &arg4, &arg5) == FAILURE) { + if (ARG_COUNT(ht) != 5 || zend_get_parameters_ex(5, &arg1, &arg2,&arg3, &arg4, &arg5) == FAILURE) { WRONG_PARAM_COUNT; } @@ -372,7 +372,7 @@ FDFErc err; FDF_TLS_VARS; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } @@ -404,7 +404,7 @@ FDFErc err; FDF_TLS_VARS; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } @@ -439,7 +439,7 @@ FDFErc err; FDF_TLS_VARS; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } @@ -471,7 +471,7 @@ FDFErc err; FDF_TLS_VARS; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } @@ -506,7 +506,7 @@ FDFErc err; FDF_TLS_VARS; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } @@ -536,7 +536,7 @@ pdfFileSpecRec filespec; FDF_TLS_VARS; - if (ARG_COUNT(ht) != 5 || getParametersEx(5, &arg1, &arg2,&arg3, &arg4, &arg5) == FAILURE) { + if (ARG_COUNT(ht) != 5 || zend_get_parameters_ex(5, &arg1, &arg2,&arg3, &arg4, &arg5) == FAILURE) { WRONG_PARAM_COUNT; } Index: php4/ext/gettext/gettext.c diff -u php4/ext/gettext/gettext.c:1.11 php4/ext/gettext/gettext.c:1.12 --- php4/ext/gettext/gettext.c:1.11 Fri Dec 17 16:50:03 1999 +++ php4/ext/gettext/gettext.c Sat Dec 18 17:35:03 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gettext.c,v 1.11 1999/12/17 21:50:03 zeev Exp $ */ +/* $Id: gettext.c,v 1.12 1999/12/18 22:35:03 zeev Exp $ */ #include <stdio.h> #include "php.h" @@ -51,7 +51,7 @@ char *domain_name, *retval; char *val; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &domain) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &domain) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(domain); @@ -73,7 +73,7 @@ pval **msgid; char *msgstr; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &msgid) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &msgid) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(msgid); @@ -89,7 +89,7 @@ char *msgstr; if (ARG_COUNT(ht) != 2 - || getParametersEx(2, &domain_name, &msgid) == FAILURE) + || zend_get_parameters_ex(2, &domain_name, &msgid) == FAILURE) { WRONG_PARAM_COUNT; } @@ -107,7 +107,7 @@ char *msgstr; if (ARG_COUNT(ht) != 3 - || getParametersEx(3, &domain_name, &msgid, &category) == FAILURE) + || zend_get_parameters_ex(3, &domain_name, &msgid, &category) == FAILURE) { WRONG_PARAM_COUNT; } @@ -129,7 +129,7 @@ char *val; if (ARG_COUNT(ht) != 2 - || getParametersEx(2, &domain_name, &dir) == FAILURE) + || zend_get_parameters_ex(2, &domain_name, &dir) == FAILURE) { WRONG_PARAM_COUNT; } Index: php4/ext/hyperwave/hw.c diff -u php4/ext/hyperwave/hw.c:1.33 php4/ext/hyperwave/hw.c:1.34 --- php4/ext/hyperwave/hw.c:1.33 Fri Dec 17 16:50:05 1999 +++ php4/ext/hyperwave/hw.c Sat Dec 18 17:35:05 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hw.c,v 1.33 1999/12/17 21:50:05 zeev Exp $ */ +/* $Id: hw.c,v 1.34 1999/12/18 22:35:05 zeev Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" #endif @@ -916,7 +916,7 @@ int id, type; hw_connection *ptr; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); @@ -940,7 +940,7 @@ hw_connection *ptr; char *str; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); @@ -972,7 +972,7 @@ int id, type; hw_connection *ptr; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); @@ -995,7 +995,7 @@ hw_connection *ptr; char errstr[100]; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); @@ -1100,7 +1100,7 @@ int link, type; hw_connection *ptr; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { return NULL; } convert_to_long_ex(arg1); @@ -1259,7 +1259,7 @@ int link, id, type, msgid; hw_connection *ptr; - if (ARG_COUNT(ht) != 3 || getParametersEx(3, &arg1, &arg2, &arg3) == FAILURE) { + if (ARG_COUNT(ht) != 3 || zend_get_parameters_ex(3, &arg1, &arg2, &arg3) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); @@ -1298,7 +1298,7 @@ argc = ARG_COUNT(ht); if(argc < 2 || argc > 3) WRONG_PARAM_COUNT; - if (getParametersArrayEx(argc, argv) == FAILURE) + if (zend_get_parameters_array_ex(argc, argv) == FAILURE) WRONG_PARAM_COUNT; convert_to_long_ex(argv[0]); @@ -2767,7 +2767,7 @@ int count; hw_connection *ptr; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); @@ -2813,7 +2813,7 @@ char **childObjRecs = NULL; hw_connection *ptr; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); @@ -2847,7 +2847,7 @@ int count; hw_connection *ptr; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); @@ -2893,7 +2893,7 @@ char **childObjRecs = NULL; hw_connection *ptr; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); @@ -2957,7 +2957,7 @@ int link, id, type; hw_connection *ptr; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); @@ -2995,7 +2995,7 @@ int *childIDs = NULL; hw_connection *ptr; - if (ARG_COUNT(ht) != 3 || getParametersEx(3, &arg1, &arg2, &arg3) == FAILURE) { + if (ARG_COUNT(ht) != 3 || zend_get_parameters_ex(3, &arg1, &arg2, &arg3) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); @@ -3038,7 +3038,7 @@ char **childObjRecs = NULL; hw_connection *ptr; - if (ARG_COUNT(ht) != 3 || getParametersEx(3, &arg1, &arg2, &arg3) == FAILURE) { + if (ARG_COUNT(ht) != 3 || zend_get_parameters_ex(3, &arg1, &arg2, &arg3) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); @@ -3076,7 +3076,7 @@ hw_connection *ptr; int *childIDs = NULL; - if (ARG_COUNT(ht) != 4 || getParametersEx(4, &arg1, &arg2, &arg3, &arg4) == FAILURE) { + if (ARG_COUNT(ht) != 4 || zend_get_parameters_ex(4, &arg1, &arg2, &arg3, &arg4) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); @@ -3121,7 +3121,7 @@ hw_connection *ptr; char **childObjRecs = NULL; - if (ARG_COUNT(ht) != 4 || getParametersEx(4, &arg1, &arg2, &arg3, &arg4) == FAILURE) { + if (ARG_COUNT(ht) != 4 || zend_get_parameters_ex(4, &arg1, &arg2, &arg3, &arg4) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); @@ -3160,7 +3160,7 @@ int *childIDs = NULL; hw_connection *ptr; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); @@ -3199,7 +3199,7 @@ char **childObjRecs = NULL; hw_connection *ptr; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); @@ -3234,7 +3234,7 @@ int *anchorIDs = NULL; hw_connection *ptr; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); @@ -3273,7 +3273,7 @@ char **anchorObjRecs = NULL; hw_connection *ptr; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); @@ -3305,7 +3305,7 @@ int link, type; hw_connection *ptr; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); @@ -3330,7 +3330,7 @@ char *name, *passwd, *userdata; hw_connection *ptr; - if (ARG_COUNT(ht) != 3 || getParametersEx(3, &arg1, &arg2, &arg3) == FAILURE) { + if (ARG_COUNT(ht) != 3 || zend_get_parameters_ex(3, &arg1, &arg2, &arg3) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); @@ -3378,13 +3378,13 @@ switch(ARG_COUNT(ht)) { case 1: - if(getParametersEx(1, &arg1) == FAILURE) + if(zend_get_parameters_ex(1, &arg1) == FAILURE) WRONG_PARAM_COUNT; convert_to_string_ex(arg1); make2_return_array_from_objrec(&return_value, (*arg1)->value.str.val, NULL); break; case 2: - if(getParametersEx(2, &arg1, &arg2) == FAILURE) + if(zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) WRONG_PARAM_COUNT; convert_to_array_ex(arg2); convert_to_string_ex(arg1); @@ -3402,7 +3402,7 @@ pval **arg1; char *objrec, *retobj; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_array_ex(arg1); @@ -3424,7 +3424,7 @@ hw_connection *ptr; int cobjids, ccollids, *objectIDs, *collIDs, cretids, *retIDs, retcoll; - if (ARG_COUNT(ht) != 4 || getParametersEx(4, &arg1, &arg2, &arg3, &arg4) == FAILURE) { + if (ARG_COUNT(ht) != 4 || zend_get_parameters_ex(4, &arg1, &arg2, &arg3, &arg4) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); @@ -3485,7 +3485,7 @@ int id, newid, type, link; hw_connection *ptr; - if (ARG_COUNT(ht) != 3 || getParametersEx(3, &arg1, &arg2, &arg3) == FAILURE) { + if (ARG_COUNT(ht) != 3 || zend_get_parameters_ex(3, &arg1, &arg2, &arg3) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); @@ -3527,7 +3527,7 @@ if((argc < 3) || (argc > 4)) WRONG_PARAM_COUNT; - if (getParametersArrayEx(argc, argv) == FAILURE) + if (zend_get_parameters_array_ex(argc, argv) == FAILURE) WRONG_PARAM_COUNT; convert_to_long_ex(argv[0]); @@ -3566,7 +3566,7 @@ char **childObjRecs = NULL; hw_connection *ptr; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); @@ -3598,7 +3598,7 @@ int link, type, servid, id, virtid; hw_connection *ptr; - if (ARG_COUNT(ht) != 3 || getParametersEx(3, &arg1, &arg2, &arg3) == FAILURE) { + if (ARG_COUNT(ht) != 3 || zend_get_parameters_ex(3, &arg1, &arg2, &arg3) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); @@ -3631,7 +3631,7 @@ char *anchorstr; hw_connection *ptr; - if (ARG_COUNT(ht) != 4 || getParametersEx(4, &arg1, &arg2, &arg3, &arg4) == FAILURE) { + if (ARG_COUNT(ht) != 4 || zend_get_parameters_ex(4, &arg1, &arg2, &arg3, &arg4) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); @@ -3673,7 +3673,7 @@ hw_connection *ptr; int link, type; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); Index: php4/ext/ldap/ldap.c diff -u php4/ext/ldap/ldap.c:1.20 php4/ext/ldap/ldap.c:1.21 --- php4/ext/ldap/ldap.c:1.20 Sat Dec 18 06:49:31 1999 +++ php4/ext/ldap/ldap.c Sat Dec 18 17:35:06 1999 @@ -20,7 +20,7 @@ */ -/* $Id: ldap.c,v 1.20 1999/12/18 11:49:31 zeev Exp $ */ +/* $Id: ldap.c,v 1.21 1999/12/18 22:35:06 zeev Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -277,7 +277,7 @@ php_printf("<table>" "<tr><td>Total links:</td><td>%d/%s</td></tr>\n" - "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.20 1999/12/18 11:49:31 zeev Exp $</td></tr>\n" + "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.21 1999/12/18 22:35:06 zeev Exp $</td></tr>\n" #if HAVE_NSLDAP "<tr><td>SDK Version:</td><td>%f</td></tr>" "<tr><td>Highest LDAP Protocol Supported:</td><td>%f</td></tr>" @@ -321,7 +321,7 @@ case 1: { pval **yyhost; - if (getParametersEx(1, &yyhost) == FAILURE) { + if (zend_get_parameters_ex(1, &yyhost) == FAILURE) { RETURN_FALSE; } @@ -338,7 +338,7 @@ case 2: { pval **yyhost, **yyport; - if (getParametersEx(2, &yyhost,&yyport) == FAILURE) { + if (zend_get_parameters_ex(2, &yyhost,&yyport) == FAILURE) { RETURN_FALSE; } @@ -450,7 +450,7 @@ { pval **berp; - if ( getParametersEx(1,&berp) == FAILURE ) { + if ( zend_get_parameters_ex(1,&berp) == FAILURE ) { WRONG_PARAM_COUNT; } @@ -469,7 +469,7 @@ switch(ARG_COUNT(ht)) { case 1: /* Anonymous Bind */ - if (getParametersEx(1, &link) == FAILURE) { + if (zend_get_parameters_ex(1, &link) == FAILURE) { WRONG_PARAM_COUNT; } @@ -479,7 +479,7 @@ break; case 3 : - if (getParametersEx(3, &link, &bind_rdn,&bind_pw) == FAILURE) { + if (zend_get_parameters_ex(3, &link, &bind_rdn,&bind_pw) == FAILURE) { WRONG_PARAM_COUNT; } @@ -522,7 +522,7 @@ pval **link; LDAP *ldap; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &link) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &link) == FAILURE) { WRONG_PARAM_COUNT; } @@ -550,7 +550,7 @@ switch(ARG_COUNT(ht)) { case 3 : - if (getParametersEx(3, &link, &base_dn,&filter) == FAILURE) { + if (zend_get_parameters_ex(3, &link, &base_dn,&filter) == FAILURE) { WRONG_PARAM_COUNT; } @@ -563,7 +563,7 @@ break; case 4 : - if (getParametersEx(4, &link, &base_dn,&filter, &attrs) == FAILURE) { + if (zend_get_parameters_ex(4, &link, &base_dn,&filter, &attrs) == FAILURE) { WRONG_PARAM_COUNT; } @@ -670,7 +670,7 @@ pval **result; LDAPMessage *ldap_result; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &result) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &result) == FAILURE) { WRONG_PARAM_COUNT; } @@ -693,7 +693,7 @@ LDAP *ldap; LDAPMessage *ldap_result; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &link, &result) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &link, &result) == FAILURE) { WRONG_PARAM_COUNT; } @@ -717,7 +717,7 @@ LDAPMessage *ldap_result_entry; LDAP_TLS_VARS; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &link, &result) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &link, &result) == FAILURE) { WRONG_PARAM_COUNT; } @@ -744,7 +744,7 @@ LDAPMessage *ldap_result_entry, *ldap_result_entry_next; LDAP_TLS_VARS; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &link,&result_entry) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &link,&result_entry) == FAILURE) { WRONG_PARAM_COUNT; } @@ -778,7 +778,7 @@ char **ldap_value; char *dn; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &link, &result) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &link, &result) == FAILURE) { WRONG_PARAM_COUNT; } @@ -860,7 +860,7 @@ char *attribute; LDAP_TLS_VARS; - if (ARG_COUNT(ht) != 3 || getParametersEx(3, &link,&result,&berp) == FAILURE || ParameterPassedByReference(ht,3)==0 ) { + if (ARG_COUNT(ht) != 3 || zend_get_parameters_ex(3, &link,&result,&berp) == FAILURE || ParameterPassedByReference(ht,3)==0 ) { WRONG_PARAM_COUNT; } @@ -895,7 +895,7 @@ BerElement *ber; char *attribute; - if (ARG_COUNT(ht) != 3 || getParametersEx(3, &link,&result,&berp) == FAILURE ) { + if (ARG_COUNT(ht) != 3 || zend_get_parameters_ex(3, &link,&result,&berp) == FAILURE ) { WRONG_PARAM_COUNT; } @@ -931,7 +931,7 @@ int i, count, num_values, num_attrib; BerElement *ber; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &link, &result_entry) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &link, &result_entry) == FAILURE) { WRONG_PARAM_COUNT; } @@ -987,7 +987,7 @@ char **ldap_value; int i, num_values; - if (ARG_COUNT(ht) != 3 || getParametersEx(3, &link,&result_entry, &attr) == FAILURE) { + if (ARG_COUNT(ht) != 3 || zend_get_parameters_ex(3, &link,&result_entry, &attr) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1036,7 +1036,7 @@ LDAPMessage *entry; char *text; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &link, &entryp) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &link, &entryp) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1066,7 +1066,7 @@ char **ldap_value; int i, count; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &dn,&with_attrib) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &dn,&with_attrib) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1099,7 +1099,7 @@ pval **dn; char *ufn; - if (ARG_COUNT(ht) !=1 || getParametersEx(1,&dn)==FAILURE) { + if (ARG_COUNT(ht) !=1 || zend_get_parameters_ex(1,&dn)==FAILURE) { WRONG_PARAM_COUNT; } @@ -1133,7 +1133,7 @@ ulong index; int is_full_add=0; /* flag for full add operation so ldap_mod_add can be put back into oper, gerrit THomson */ - if (ARG_COUNT(ht) != 3 || getParametersEx(3, &link, &dn,&entry) == FAILURE) { + if (ARG_COUNT(ht) != 3 || zend_get_parameters_ex(3, &link, &dn,&entry) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1283,7 +1283,7 @@ LDAP *ldap; char *ldap_dn; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &link, &dn) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &link, &dn) == FAILURE) { WRONG_PARAM_COUNT; } Index: php4/ext/mcrypt/mcrypt.c diff -u php4/ext/mcrypt/mcrypt.c:1.22 php4/ext/mcrypt/mcrypt.c:1.23 --- php4/ext/mcrypt/mcrypt.c:1.22 Sun Nov 14 19:27:47 1999 +++ php4/ext/mcrypt/mcrypt.c Sat Dec 18 17:35:07 1999 @@ -182,7 +182,7 @@ int i; int n = 0; - if(ARG_COUNT(ht) != 2 || getParametersEx(2, &size, &psource) == FAILURE) { + if(ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &size, &psource) == FAILURE) { WRONG_PARAM_COUNT; } @@ -227,7 +227,7 @@ pval **cipher; char *str, *nstr; - if(ARG_COUNT(ht) != 1 || getParametersEx(1, &cipher) == FAILURE) { + if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &cipher) == FAILURE) { WRONG_PARAM_COUNT; } @@ -249,7 +249,7 @@ { pval **cipher; - if(ARG_COUNT(ht) != 1 || getParametersEx(1, &cipher) == FAILURE) { + if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &cipher) == FAILURE) { WRONG_PARAM_COUNT; } @@ -264,7 +264,7 @@ { pval **cipher; - if(ARG_COUNT(ht) != 1 || getParametersEx(1, &cipher) == FAILURE) { + if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &cipher) == FAILURE) { WRONG_PARAM_COUNT; } @@ -280,7 +280,7 @@ MCRYPT_ARGS; if(ARG_COUNT(ht) != 5 || - getParametersEx(5, &cipher, &key, &data, &mode, &iv) == FAILURE) { + zend_get_parameters_ex(5, &cipher, &key, &data, &mode, &iv) == FAILURE) { WRONG_PARAM_COUNT; } MCRYPT_CONVERT; @@ -301,7 +301,7 @@ MCRYPT_ARGS; if(ARG_COUNT(ht) != 5 || - getParametersEx(5, &cipher, &key, &data, &mode, &iv) == FAILURE) { + zend_get_parameters_ex(5, &cipher, &key, &data, &mode, &iv) == FAILURE) { WRONG_PARAM_COUNT; } MCRYPT_CONVERT; @@ -324,7 +324,7 @@ int ac = ARG_COUNT(ht); if(ac < 4 || ac > 5 || - getParametersEx(ac, &cipher, &key, &data, &mode, &iv) == FAILURE) { + zend_get_parameters_ex(ac, &cipher, &key, &data, &mode, &iv) == FAILURE) { WRONG_PARAM_COUNT; } MCRYPT_CONVERT; @@ -352,7 +352,7 @@ MCRYPT_ARGS2; if(ARG_COUNT(ht) != 4 || - getParametersEx(4, &cipher, &key, &data, &mode) == FAILURE) { + zend_get_parameters_ex(4, &cipher, &key, &data, &mode) == FAILURE) { WRONG_PARAM_COUNT; } MCRYPT_CONVERT; Index: php4/ext/mhash/mhash.c diff -u php4/ext/mhash/mhash.c:1.11 php4/ext/mhash/mhash.c:1.12 --- php4/ext/mhash/mhash.c:1.11 Fri Nov 26 12:12:01 1999 +++ php4/ext/mhash/mhash.c Sat Dec 18 17:35:09 1999 @@ -76,7 +76,7 @@ { pval **hash; - if(ARG_COUNT(ht) != 1 || getParametersEx(1, &hash) == FAILURE) { + if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &hash) == FAILURE) { WRONG_PARAM_COUNT; } @@ -92,7 +92,7 @@ pval **hash; char *name; - if(ARG_COUNT(ht) != 1 || getParametersEx(1, &hash) == FAILURE) { + if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &hash) == FAILURE) { WRONG_PARAM_COUNT; } @@ -116,7 +116,7 @@ int bsize; unsigned char *hash_data; - if(ARG_COUNT(ht) != 2 || getParametersEx(2, &hash, &data) == FAILURE) { + if(ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &hash, &data) == FAILURE) { WRONG_PARAM_COUNT; } Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.4 php4/ext/mssql/php_mssql.c:1.5 --- php4/ext/mssql/php_mssql.c:1.4 Fri Dec 17 16:13:15 1999 +++ php4/ext/mssql/php_mssql.c Sat Dec 18 17:35:11 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.4 1999/12/17 21:13:15 zeev Exp $ */ +/* $Id: php_mssql.c,v 1.5 1999/12/18 22:35:11 zeev Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" @@ -312,7 +312,7 @@ case 1: { pval **yyhost; - if (getParametersEx(1, &yyhost)==FAILURE) { + if (zend_get_parameters_ex(1, &yyhost)==FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(yyhost); @@ -323,7 +323,7 @@ case 2: { pval **yyhost,**yyuser; - if (getParametersEx(2, &yyhost, &yyuser)==FAILURE) { + if (zend_get_parameters_ex(2, &yyhost, &yyuser)==FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(yyhost); @@ -336,7 +336,7 @@ case 3: { pval **yyhost,**yyuser,**yypasswd; - if (getParametersEx(3, &yyhost, &yyuser, &yypasswd) == FAILURE) { + if (zend_get_parameters_ex(3, &yyhost, &yyuser, &yypasswd) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(yyhost); @@ -602,7 +602,7 @@ id = MS_SQL_G(default_link); break; case 1: - if (getParametersEx(1, &mssql_link_index)==FAILURE) { + if (zend_get_parameters_ex(1, &mssql_link_index)==FAILURE) { RETURN_FALSE; } ZEND_FETCH_RESOURCE2(mssql_ptr, mssql_link *, mssql_link_index, -1, "MS SQL-Link", MS_SQL_G(le_link), MS_SQL_G(le_plink)); @@ -628,13 +628,13 @@ switch(ARG_COUNT(ht)) { case 1: - if (getParametersEx(1, &db)==FAILURE) { + if (zend_get_parameters_ex(1, &db)==FAILURE) { RETURN_FALSE; } id = php_mssql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); break; case 2: - if (getParametersEx(2, &db, &mssql_link_index)==FAILURE) { + if (zend_get_parameters_ex(2, &db, &mssql_link_index)==FAILURE) { RETURN_FALSE; } ZEND_FETCH_RESOURCE2(mssql_ptr, mssql_link *, mssql_link_index, -1, "MS SQL-Link", MS_SQL_G(le_link), MS_SQL_G(le_plink)); @@ -753,13 +753,13 @@ switch(ARG_COUNT(ht)) { case 1: - if (getParametersEx(1, &query)==FAILURE) { + if (zend_get_parameters_ex(1, &query)==FAILURE) { RETURN_FALSE; } // id = MS_SQL_G(default_link); break; case 2: - if (getParametersEx(2, &query, &mssql_link_index)==FAILURE) { + if (zend_get_parameters_ex(2, &query, &mssql_link_index)==FAILURE) { RETURN_FALSE; } ZEND_FETCH_RESOURCE2(mssql_ptr, mssql_link *, mssql_link_index, -1, "MS SQL-Link", MS_SQL_G(le_link), MS_SQL_G(le_plink)); @@ -876,7 +876,7 @@ MSSQLLS_FETCH(); - if (ARG_COUNT(ht)!=1 || getParametersEx(1, &mssql_result_index)==FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &mssql_result_index)==FAILURE) { WRONG_PARAM_COUNT; } @@ -899,7 +899,7 @@ MSSQLLS_FETCH(); - if (ARG_COUNT(ht)!=1 || getParametersEx(1, &mssql_result_index)==FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &mssql_result_index)==FAILURE) { WRONG_PARAM_COUNT; } @@ -916,7 +916,7 @@ MSSQLLS_FETCH(); - if (ARG_COUNT(ht)!=1 || getParametersEx(1, &mssql_result_index)==FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &mssql_result_index)==FAILURE) { WRONG_PARAM_COUNT; } @@ -934,7 +934,7 @@ pval *field_content; MSSQLLS_FETCH(); - if (ARG_COUNT(ht)!=1 || getParametersEx(1, &mssql_result_index)==FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &mssql_result_index)==FAILURE) { WRONG_PARAM_COUNT; } @@ -964,7 +964,7 @@ PLS_FETCH(); - if (ARG_COUNT(ht)!=1 || getParametersEx(1, &mssql_result_index)==FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &mssql_result_index)==FAILURE) { WRONG_PARAM_COUNT; } Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.14 php4/ext/mysql/php_mysql.c:1.15 --- php4/ext/mysql/php_mysql.c:1.14 Fri Dec 17 14:16:42 1999 +++ php4/ext/mysql/php_mysql.c Sat Dec 18 17:35:15 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.14 1999/12/17 19:16:42 zeev Exp $ */ +/* $Id: php_mysql.c,v 1.15 1999/12/18 22:35:15 zeev Exp $ */ /* TODO: @@ -392,7 +392,7 @@ case 1: { pval **yyhost; - if (getParametersEx(1, &yyhost)==FAILURE) { + if (zend_get_parameters_ex(1, &yyhost)==FAILURE) { RETURN_FALSE; } convert_to_string_ex(yyhost); @@ -402,7 +402,7 @@ case 2: { pval **yyhost, **yyuser; - if (getParametersEx(2, &yyhost, &yyuser)==FAILURE) { + if (zend_get_parameters_ex(2, &yyhost, &yyuser)==FAILURE) { RETURN_FALSE; } convert_to_string_ex(yyhost); @@ -414,7 +414,7 @@ case 3: { pval **yyhost,**yyuser,**yypasswd; - if (getParametersEx(3, &yyhost, &yyuser, &yypasswd) == FAILURE) { + if (zend_get_parameters_ex(3, &yyhost, &yyuser, &yypasswd) == FAILURE) { RETURN_FALSE; } convert_to_string_ex(yyhost); @@ -638,7 +638,7 @@ id = MySG(default_link); break; case 1: - if (getParametersEx(1, &mysql_link)==FAILURE) { + if (zend_get_parameters_ex(1, &mysql_link)==FAILURE) { RETURN_FALSE; } id = -1; @@ -667,14 +667,14 @@ switch(ARG_COUNT(ht)) { case 1: - if (getParametersEx(1, &db)==FAILURE) { + if (zend_get_parameters_ex(1, &db)==FAILURE) { RETURN_FALSE; } id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MySLS_CC); CHECK_LINK(id); break; case 2: - if (getParametersEx(2, &db, &mysql_link)==FAILURE) { + if (zend_get_parameters_ex(2, &db, &mysql_link)==FAILURE) { RETURN_FALSE; } id = -1; @@ -709,14 +709,14 @@ switch(ARG_COUNT(ht)) { case 1: - if (getParametersEx(1, &db)==FAILURE) { + if (zend_get_parameters_ex(1, &db)==FAILURE) { RETURN_FALSE; } id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MySLS_CC); CHECK_LINK(id); break; case 2: - if (getParametersEx(2, &db, &mysql_link)==FAILURE) { + if (zend_get_parameters_ex(2, &db, &mysql_link)==FAILURE) { RETURN_FALSE; } id = -1; @@ -749,14 +749,14 @@ switch(ARG_COUNT(ht)) { case 1: - if (getParametersEx(1, &db)==FAILURE) { + if (zend_get_parameters_ex(1, &db)==FAILURE) { RETURN_FALSE; } id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MySLS_CC); CHECK_LINK(id); break; case 2: - if (getParametersEx(2, &db, &mysql_link)==FAILURE) { + if (zend_get_parameters_ex(2, &db, &mysql_link)==FAILURE) { RETURN_FALSE; } id = -1; @@ -791,14 +791,14 @@ switch(ARG_COUNT(ht)) { case 1: - if (getParametersEx(1, &query)==FAILURE) { + if (zend_get_parameters_ex(1, &query)==FAILURE) { RETURN_FALSE; } id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MySLS_CC); CHECK_LINK(id); break; case 2: - if (getParametersEx(2, &query, &mysql_link)==FAILURE) { + if (zend_get_parameters_ex(2, &query, &mysql_link)==FAILURE) { RETURN_FALSE; } id = -1; @@ -846,14 +846,14 @@ switch(ARG_COUNT(ht)) { case 2: - if (getParametersEx(2, &db, &query)==FAILURE) { + if (zend_get_parameters_ex(2, &db, &query)==FAILURE) { RETURN_FALSE; } id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MySLS_CC); CHECK_LINK(id); break; case 3: - if (getParametersEx(3, &db, &query, &mysql_link)==FAILURE) { + if (zend_get_parameters_ex(3, &db, &query, &mysql_link)==FAILURE) { RETURN_FALSE; } id = -1; @@ -910,7 +910,7 @@ CHECK_LINK(id); break; case 1: - if (getParametersEx(1, &mysql_link)==FAILURE) { + if (zend_get_parameters_ex(1, &mysql_link)==FAILURE) { RETURN_FALSE; } id = -1; @@ -943,14 +943,14 @@ switch(ARG_COUNT(ht)) { case 1: - if (getParametersEx(1, &db)==FAILURE) { + if (zend_get_parameters_ex(1, &db)==FAILURE) { RETURN_FALSE; } id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MySLS_CC); CHECK_LINK(id); break; case 2: - if (getParametersEx(2, &db, &mysql_link)==FAILURE) { + if (zend_get_parameters_ex(2, &db, &mysql_link)==FAILURE) { RETURN_FALSE; } id = -1; @@ -987,14 +987,14 @@ switch(ARG_COUNT(ht)) { case 2: - if (getParametersEx(2, &db, &table)==FAILURE) { + if (zend_get_parameters_ex(2, &db, &table)==FAILURE) { RETURN_FALSE; } id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MySLS_CC); CHECK_LINK(id); break; case 3: - if (getParametersEx(3, &db, &table, &mysql_link)==FAILURE) { + if (zend_get_parameters_ex(3, &db, &table, &mysql_link)==FAILURE) { RETURN_FALSE; } id = -1; @@ -1037,7 +1037,7 @@ } break; case 1: - if (getParametersEx(1, &mysql_link)==FAILURE) { + if (zend_get_parameters_ex(1, &mysql_link)==FAILURE) { RETURN_FALSE; } id = -1; @@ -1072,7 +1072,7 @@ } break; case 1: - if (getParametersEx(1, &mysql_link)==FAILURE) { + if (zend_get_parameters_ex(1, &mysql_link)==FAILURE) { RETURN_FALSE; } id = -1; @@ -1105,7 +1105,7 @@ CHECK_LINK(id); break; case 1: - if (getParametersEx(1, &mysql_link)==FAILURE) { + if (zend_get_parameters_ex(1, &mysql_link)==FAILURE) { RETURN_FALSE; } id = -1; @@ -1139,7 +1139,7 @@ CHECK_LINK(id); break; case 1: - if (getParametersEx(1, &mysql_link)==FAILURE) { + if (zend_get_parameters_ex(1, &mysql_link)==FAILURE) { RETURN_FALSE; } id = -1; @@ -1171,12 +1171,12 @@ switch (ARG_COUNT(ht)) { case 2: - if (getParametersEx(2, &result, &row)==FAILURE) { + if (zend_get_parameters_ex(2, &result, &row)==FAILURE) { RETURN_FALSE; } break; case 3: - if (getParametersEx(3, &result, &row, &field)==FAILURE) { + if (zend_get_parameters_ex(3, &result, &row, &field)==FAILURE) { RETURN_FALSE; } break; @@ -1272,7 +1272,7 @@ pval **result; MYSQL_RES *mysql_result; - if (ARG_COUNT(ht)!=1 || getParametersEx(1, &result)==FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &result)==FAILURE) { WRONG_PARAM_COUNT; } @@ -1291,7 +1291,7 @@ pval **result; MYSQL_RES *mysql_result; - if (ARG_COUNT(ht)!=1 || getParametersEx(1, &result)==FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &result)==FAILURE) { WRONG_PARAM_COUNT; } @@ -1316,7 +1316,7 @@ switch (ARG_COUNT(ht)) { case 1: - if (getParametersEx(1, &result)==FAILURE) { + if (zend_get_parameters_ex(1, &result)==FAILURE) { RETURN_FALSE; } if (!result_type) { @@ -1324,7 +1324,7 @@ } break; case 2: - if (getParametersEx(2, &result, &arg2)==FAILURE) { + if (zend_get_parameters_ex(2, &result, &arg2)==FAILURE) { RETURN_FALSE; } convert_to_long_ex(arg2); @@ -1419,7 +1419,7 @@ pval **result, **offset; MYSQL_RES *mysql_result; - if (ARG_COUNT(ht)!=2 || getParametersEx(2, &result, &offset)==FAILURE) { + if (ARG_COUNT(ht)!=2 || zend_get_parameters_ex(2, &result, &offset)==FAILURE) { WRONG_PARAM_COUNT; } @@ -1447,7 +1447,7 @@ int i; - if (ARG_COUNT(ht)!=1 || getParametersEx(1, &result)==FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &result)==FAILURE) { WRONG_PARAM_COUNT; } @@ -1527,12 +1527,12 @@ switch (ARG_COUNT(ht)) { case 1: - if (getParametersEx(1, &result)==FAILURE) { + if (zend_get_parameters_ex(1, &result)==FAILURE) { RETURN_FALSE; } break; case 2: - if (getParametersEx(2, &result, &field)==FAILURE) { + if (zend_get_parameters_ex(2, &result, &field)==FAILURE) { RETURN_FALSE; } convert_to_long_ex(field); @@ -1581,7 +1581,7 @@ pval **result, **offset; MYSQL_RES *mysql_result; - if (ARG_COUNT(ht)!=2 || getParametersEx(2, &result, &offset)==FAILURE) { + if (ARG_COUNT(ht)!=2 || zend_get_parameters_ex(2, &result, &offset)==FAILURE) { WRONG_PARAM_COUNT; } @@ -1613,7 +1613,7 @@ char buf[512]; int len; - if (ARG_COUNT(ht)!=2 || getParametersEx(2, &result, &field)==FAILURE) { + if (ARG_COUNT(ht)!=2 || zend_get_parameters_ex(2, &result, &field)==FAILURE) { WRONG_PARAM_COUNT; } @@ -1777,7 +1777,7 @@ pval **result; MYSQL_RES *mysql_result; - if (ARG_COUNT(ht)!=1 || getParametersEx(1, &result)==FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &result)==FAILURE) { WRONG_PARAM_COUNT; } Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.47 php4/ext/oci8/oci8.c:1.48 --- php4/ext/oci8/oci8.c:1.47 Fri Dec 17 17:27:23 1999 +++ php4/ext/oci8/oci8.c Sat Dec 18 17:35:16 1999 @@ -22,7 +22,7 @@ #define OCI_USE_EMALLOC 0 /* set this to 1 if you want to use the php memory manager! */ -/* $Id: oci8.c,v 1.47 1999/12/17 22:27:23 zeev Exp $ */ +/* $Id: oci8.c,v 1.48 1999/12/18 22:35:16 zeev Exp $ */ /* TODO list: * @@ -2029,7 +2029,7 @@ oci_connection *connection = 0; OCILS_FETCH(); - if (getParametersEx(3, &userParam, &passParam, &dbParam) == SUCCESS) { + if (zend_get_parameters_ex(3, &userParam, &passParam, &dbParam) == SUCCESS) { convert_to_string_ex(userParam); convert_to_string_ex(passParam); convert_to_string_ex(dbParam); @@ -2037,7 +2037,7 @@ username = (*userParam)->value.str.val; password = (*passParam)->value.str.val; dbname = (*dbParam)->value.str.val; - } else if (getParametersEx(2, &userParam, &passParam) == SUCCESS) { + } else if (zend_get_parameters_ex(2, &userParam, &passParam) == SUCCESS) { convert_to_string_ex(userParam); convert_to_string_ex(passParam); @@ -2181,7 +2181,7 @@ ub2 ocitype = SQLT_STR; /* zero terminated string */ int ac = ARG_COUNT(ht); - if (ac < 3 || ac > 4 || getParametersEx(ac, &stmt, &name, &var, &type) == FAILURE) { + if (ac < 3 || ac > 4 || zend_get_parameters_ex(ac, &stmt, &name, &var, &type) == FAILURE) { WRONG_PARAM_COUNT; } @@ -2243,7 +2243,7 @@ dvoid *mydescr = 0; int ac = ARG_COUNT(ht); - if (ac < 4 || ac > 5 || getParametersEx(ac, &stmt, &name, &var, &maxlen, &type) == FAILURE) { + if (ac < 4 || ac > 5 || zend_get_parameters_ex(ac, &stmt, &name, &var, &maxlen, &type) == FAILURE) { WRONG_PARAM_COUNT; } @@ -2426,7 +2426,7 @@ } offset = 0; - if (getParametersEx(2, &arg, &oarg) == SUCCESS) { + if (zend_get_parameters_ex(2, &arg, &oarg) == SUCCESS) { convert_to_long_ex(oarg); offparam = (*oarg)->value.lval; @@ -2446,7 +2446,7 @@ } else { offset = offparam; } - } else if (getParametersEx(1, &arg) == FAILURE) { + } else if (zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } @@ -2526,7 +2526,7 @@ RETURN_FALSE; } - if (getParametersEx(1, &arg) == FAILURE) { + if (zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } @@ -2658,7 +2658,7 @@ RETURN_FALSE; } - if (ac < 0 || ac > 3 || getParametersEx(ac, &zfilename, &zstart, &zlength) == FAILURE) { + if (ac < 0 || ac > 3 || zend_get_parameters_ex(ac, &zfilename, &zstart, &zlength) == FAILURE) { WRONG_PARAM_COUNT; } @@ -2822,10 +2822,10 @@ descr.type = OCI_DTYPE_LOB; - if (getParametersEx(2, &conn, &type) == SUCCESS) { + if (zend_get_parameters_ex(2, &conn, &type) == SUCCESS) { convert_to_long_ex(type); descr.type = (*type)->value.lval; - } else if (getParametersEx(1, &conn) == FAILURE) { + } else if (zend_get_parameters_ex(1, &conn) == FAILURE) { WRONG_PARAM_COUNT; } @@ -2876,7 +2876,7 @@ pval **conn; oci_connection *connection; - if (getParametersEx(1, &conn) == FAILURE) { + if (zend_get_parameters_ex(1, &conn) == FAILURE) { WRONG_PARAM_COUNT; } @@ -2905,7 +2905,7 @@ pval **conn; oci_connection *connection; - if (getParametersEx(1, &conn) == FAILURE) { + if (zend_get_parameters_ex(1, &conn) == FAILURE) { WRONG_PARAM_COUNT; } @@ -2935,7 +2935,7 @@ oci_statement *statement; oci_out_column *outcol; - if (getParametersEx(2, &stmt, &col) == FAILURE) { + if (zend_get_parameters_ex(2, &stmt, &col) == FAILURE) { WRONG_PARAM_COUNT; } @@ -2960,7 +2960,7 @@ oci_statement *statement; oci_out_column *outcol; - if (getParametersEx(2, &stmt, &col) == FAILURE) { + if (zend_get_parameters_ex(2, &stmt, &col) == FAILURE) { WRONG_PARAM_COUNT; } @@ -2984,7 +2984,7 @@ oci_statement *statement; oci_out_column *outcol; - if (getParametersEx(2, &stmt, &col) == FAILURE) { + if (zend_get_parameters_ex(2, &stmt, &col) == FAILURE) { WRONG_PARAM_COUNT; } @@ -3047,7 +3047,7 @@ oci_statement *statement; oci_out_column *outcol; - if (getParametersEx(2, &stmt, &col) == FAILURE) { + if (zend_get_parameters_ex(2, &stmt, &col) == FAILURE) { WRONG_PARAM_COUNT; } @@ -3077,7 +3077,7 @@ pval **arg; OCILS_FETCH(); - if (getParametersEx(1, &arg) == FAILURE) { + if (zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg); @@ -3096,10 +3096,10 @@ oci_statement *statement; ub4 execmode; - if (getParametersEx(2, &stmt, &mode) == SUCCESS) { + if (zend_get_parameters_ex(2, &stmt, &mode) == SUCCESS) { convert_to_long_ex(mode); execmode = (*mode)->value.lval; - } else if (getParametersEx(1, &stmt) == SUCCESS) { + } else if (zend_get_parameters_ex(1, &stmt) == SUCCESS) { execmode = OCI_COMMIT_ON_SUCCESS; } else { WRONG_PARAM_COUNT; @@ -3124,7 +3124,7 @@ pval **stmt; oci_statement *statement; - if (getParametersEx(1, &stmt) == FAILURE) { + if (zend_get_parameters_ex(1, &stmt) == FAILURE) { WRONG_PARAM_COUNT; } @@ -3148,7 +3148,7 @@ oci_statement *statement; ub4 nrows = 1; /* only one row at a time is supported for now */ - if (getParametersEx(1, &stmt) == FAILURE) { + if (zend_get_parameters_ex(1, &stmt) == FAILURE) { WRONG_PARAM_COUNT; } @@ -3176,7 +3176,7 @@ int mode = OCI_NUM; int ac = ARG_COUNT(ht); - if (ac < 2 || ac > 3 || getParametersEx(ac, &stmt, &array, &fmode) == FAILURE) { + if (ac < 2 || ac > 3 || zend_get_parameters_ex(ac, &stmt, &array, &fmode) == FAILURE) { WRONG_PARAM_COUNT; } @@ -3265,7 +3265,7 @@ char namebuf[ 128 ]; int ac = ARG_COUNT(ht); - if (ac < 2 || ac > 3 || getParametersEx(ac, &stmt, &array, &fmode) == FAILURE) { + if (ac < 2 || ac > 3 || zend_get_parameters_ex(ac, &stmt, &array, &fmode) == FAILURE) { WRONG_PARAM_COUNT; } @@ -3324,7 +3324,7 @@ pval **stmt; oci_statement *statement; - if (getParametersEx(1, &stmt) == FAILURE) { + if (zend_get_parameters_ex(1, &stmt) == FAILURE) { WRONG_PARAM_COUNT; } @@ -3347,7 +3347,7 @@ oci_connection *connection; pval **conn; - if (getParametersEx(1, &conn) == FAILURE) { + if (zend_get_parameters_ex(1, &conn) == FAILURE) { WRONG_PARAM_COUNT; } @@ -3423,7 +3423,7 @@ OCILS_FETCH(); - if (getParametersEx(1, &arg) == SUCCESS) { + if (zend_get_parameters_ex(1, &arg) == SUCCESS) { statement = (oci_statement *) zend_fetch_resource(arg, -1, NULL, NULL, 1, le_stmt); if (statement) { errh = statement->pError; @@ -3470,7 +3470,7 @@ pval **stmt; oci_statement *statement; - if (getParametersEx(1, &stmt) == FAILURE) { + if (zend_get_parameters_ex(1, &stmt) == FAILURE) { WRONG_PARAM_COUNT; } @@ -3490,7 +3490,7 @@ oci_connection *connection; oci_statement *statement; - if (getParametersEx(2, &conn, &query) == FAILURE) { + if (zend_get_parameters_ex(2, &conn, &query) == FAILURE) { WRONG_PARAM_COUNT; } @@ -3513,7 +3513,7 @@ pval **stmt, **size; oci_statement *statement; - if (getParametersEx(2, &stmt, &size) == FAILURE) { + if (zend_get_parameters_ex(2, &stmt, &size) == FAILURE) { WRONG_PARAM_COUNT; } @@ -3538,7 +3538,7 @@ oci_connection *connection; oci_statement *statement; - if (getParametersEx(1, &conn) == FAILURE) { + if (zend_get_parameters_ex(1, &conn) == FAILURE) { WRONG_PARAM_COUNT; } @@ -3560,7 +3560,7 @@ oci_statement *statement; oci_out_column *outcol = NULL; - if (getParametersEx(2, &stmt, &col) == FAILURE) { + if (zend_get_parameters_ex(2, &stmt, &col) == FAILURE) { WRONG_PARAM_COUNT; } @@ -3586,7 +3586,7 @@ pval **conn; char version[256]; - if (getParametersEx(1, &conn) == FAILURE) { + if (zend_get_parameters_ex(1, &conn) == FAILURE) { WRONG_PARAM_COUNT; } @@ -3620,7 +3620,7 @@ oci_statement *statement; ub2 stmttype; - if (getParametersEx(1, &stmt) == FAILURE) { + if (zend_get_parameters_ex(1, &stmt) == FAILURE) { WRONG_PARAM_COUNT; } @@ -3677,7 +3677,7 @@ oci_statement *statement; ub4 rowcount; - if (getParametersEx(1, &stmt) == FAILURE) { + if (zend_get_parameters_ex(1, &stmt) == FAILURE) { WRONG_PARAM_COUNT; } Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.18 php4/ext/odbc/php_odbc.c:1.19 --- php4/ext/odbc/php_odbc.c:1.18 Fri Dec 17 17:27:25 1999 +++ php4/ext/odbc/php_odbc.c Sat Dec 18 17:35:17 1999 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.18 1999/12/17 22:27:25 zeev Exp $ */ +/* $Id: php_odbc.c,v 1.19 1999/12/18 22:35:17 zeev Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" @@ -484,7 +484,7 @@ ODBCLS_FETCH(); PLS_FETCH(); - if (getParametersEx(2, &pv_res, &pv_flag) == FAILURE) + if (zend_get_parameters_ex(2, &pv_res, &pv_flag) == FAILURE) WRONG_PARAM_COUNT; convert_to_long_ex(pv_flag); @@ -571,7 +571,7 @@ pval **pv_conn; ODBCLS_FETCH(); - if (getParametersEx(1, &pv_conn) == FAILURE) { + if (zend_get_parameters_ex(1, &pv_conn) == FAILURE) { WRONG_PARAM_COUNT; } @@ -630,7 +630,7 @@ odbc_connection *conn; RETCODE rc; - if (getParametersEx(2, &pv_conn, &pv_query) == FAILURE) { + if (zend_get_parameters_ex(2, &pv_conn, &pv_query) == FAILURE) { WRONG_PARAM_COUNT; } @@ -706,10 +706,10 @@ numArgs = ARG_COUNT(ht); if (numArgs == 1) { - if (getParametersEx(1, &pv_res) == FAILURE) + if (zend_get_parameters_ex(1, &pv_res) == FAILURE) WRONG_PARAM_COUNT; } else { - if (getParametersEx(2, &pv_res, &pv_param_arr) == FAILURE) + if (zend_get_parameters_ex(2, &pv_res, &pv_param_arr) == FAILURE) WRONG_PARAM_COUNT; if ((*pv_param_arr)->type != IS_ARRAY) { @@ -859,7 +859,7 @@ RETCODE rc; ODBCLS_FETCH(); - if (getParametersEx(1, &pv_res) == FAILURE) { + if (zend_get_parameters_ex(1, &pv_res) == FAILURE) { WRONG_PARAM_COUNT; } @@ -928,11 +928,11 @@ numArgs = ARG_COUNT(ht); if (numArgs > 2) { - if (getParametersEx(3, &pv_conn, &pv_query, &pv_flags) == FAILURE) + if (zend_get_parameters_ex(3, &pv_conn, &pv_query, &pv_flags) == FAILURE) WRONG_PARAM_COUNT; convert_to_long_ex(pv_flags); } else { - if (getParametersEx(2, &pv_conn, &pv_query) == FAILURE) + if (zend_get_parameters_ex(2, &pv_conn, &pv_query) == FAILURE) WRONG_PARAM_COUNT; } @@ -1029,11 +1029,11 @@ switch(numArgs) { case 2: - if (getParametersEx(2, &pv_res, &pv_res_arr) == FAILURE) + if (zend_get_parameters_ex(2, &pv_res, &pv_res_arr) == FAILURE) WRONG_PARAM_COUNT; break; case 3: - if (getParametersEx(3, &pv_res, &pv_row, &pv_res_arr) == FAILURE) + if (zend_get_parameters_ex(3, &pv_res, &pv_row, &pv_res_arr) == FAILURE) WRONG_PARAM_COUNT; convert_to_long_ex(pv_row); rownum = (*pv_row)->value.lval; @@ -1051,7 +1051,7 @@ numArgs = ARG_COUNT(ht); - if (numArgs != 2 || getParametersEx(2, &pv_res, &pv_res_arr) == FAILURE) { + if (numArgs != 2 || zend_get_parameters_ex(2, &pv_res, &pv_res_arr) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1161,7 +1161,7 @@ RETCODE rc; pval **pv_res; - if (getParametersEx(1, &pv_res) == FAILURE) + if (zend_get_parameters_ex(1, &pv_res) == FAILURE) WRONG_PARAM_COUNT; ZEND_FETCH_RESOURCE(result, odbc_result *, pv_res, -1, "ODBC result", le_result); @@ -1197,10 +1197,10 @@ numArgs = ARG_COUNT(ht); if (numArgs == 1) { - if (getParametersEx(1, &pv_res) == FAILURE) + if (zend_get_parameters_ex(1, &pv_res) == FAILURE) WRONG_PARAM_COUNT; } else { - if (getParametersEx(2, &pv_res, &pv_row) == FAILURE) + if (zend_get_parameters_ex(2, &pv_res, &pv_row) == FAILURE) WRONG_PARAM_COUNT; convert_to_long_ex(pv_row); rownum = (*pv_row)->value.lval; @@ -1257,7 +1257,7 @@ field_ind = -1; field = NULL; - if (ARG_COUNT(ht) != 2 || getParametersEx(2 , &pv_res, &pv_field) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2 , &pv_res, &pv_field) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1425,10 +1425,10 @@ numArgs = ARG_COUNT(ht); if (numArgs == 1) { - if (getParametersEx(1, &pv_res) == FAILURE) + if (zend_get_parameters_ex(1, &pv_res) == FAILURE) WRONG_PARAM_COUNT; } else { - if (getParametersEx(2, &pv_res, &pv_format) == FAILURE) + if (zend_get_parameters_ex(2, &pv_res, &pv_format) == FAILURE) WRONG_PARAM_COUNT; } @@ -1538,7 +1538,7 @@ pval **pv_res; odbc_result *result; - if (getParametersEx(1, &pv_res) == FAILURE) { + if (zend_get_parameters_ex(1, &pv_res) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1667,14 +1667,14 @@ */ switch(ARG_COUNT(ht)) { case 3: - if (getParametersEx(3, &pv_db, &pv_uid, &pv_pwd) == FAILURE) { + if (zend_get_parameters_ex(3, &pv_db, &pv_uid, &pv_pwd) == FAILURE) { WRONG_PARAM_COUNT; } /* Use Default: Probably a better way to do this */ cur_opt = SQL_CUR_DEFAULT; break; case 4: - if (getParametersEx(4, &pv_db, &pv_uid, &pv_pwd, &pv_opt) == FAILURE) { + if (zend_get_parameters_ex(4, &pv_db, &pv_uid, &pv_pwd, &pv_opt) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(pv_opt); @@ -1841,7 +1841,7 @@ odbc_connection *conn; ODBCLS_FETCH(); - if (getParametersEx(1, &pv_conn) == FAILURE) { + if (zend_get_parameters_ex(1, &pv_conn) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1859,7 +1859,7 @@ SDWORD rows; pval **pv_res; - if (getParametersEx(1, &pv_res) == FAILURE) { + if (zend_get_parameters_ex(1, &pv_res) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1876,7 +1876,7 @@ odbc_result *result; pval **pv_res; - if (getParametersEx(1, &pv_res) == FAILURE) { + if (zend_get_parameters_ex(1, &pv_res) == FAILURE) { WRONG_PARAM_COUNT; } ZEND_FETCH_RESOURCE(result, odbc_result *, pv_res, -1, "ODBC result", le_result); @@ -1891,7 +1891,7 @@ odbc_result *result; pval **pv_res, **pv_num; - if (getParametersEx(2, &pv_res, &pv_num) == FAILURE) { + if (zend_get_parameters_ex(2, &pv_res, &pv_num) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1927,7 +1927,7 @@ SWORD tmplen; pval **pv_res, **pv_num; - if (getParametersEx(2, &pv_res, &pv_num) == FAILURE) { + if (zend_get_parameters_ex(2, &pv_res, &pv_num) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1964,7 +1964,7 @@ SDWORD len; pval **pv_res, **pv_num; - if (getParametersEx(2, &pv_res, &pv_num) == FAILURE) { + if (zend_get_parameters_ex(2, &pv_res, &pv_num) == FAILURE) { WRONG_PARAM_COUNT; } @@ -2004,7 +2004,7 @@ int i; pval **pv_res, **pv_name; - if (getParametersEx(2, &pv_res, &pv_name) == FAILURE) { + if (zend_get_parameters_ex(2, &pv_res, &pv_name) == FAILURE) { WRONG_PARAM_COUNT; } @@ -2042,11 +2042,11 @@ argc = ARG_COUNT(ht); if (argc == 2) { - if (getParametersEx(2, &pv_conn, &pv_onoff) == FAILURE) { + if (zend_get_parameters_ex(2, &pv_conn, &pv_onoff) == FAILURE) { WRONG_PARAM_COUNT; } } else if (argc == 1) { - if (getParametersEx(1, &pv_conn) == FAILURE) { + if (zend_get_parameters_ex(1, &pv_conn) == FAILURE) { WRONG_PARAM_COUNT; } } else { @@ -2114,7 +2114,7 @@ RETCODE rc; pval **pv_handle, **pv_which, **pv_opt, **pv_val; - if ( getParametersEx(4, &pv_handle, &pv_which, &pv_opt, &pv_val) == FAILURE) { + if ( zend_get_parameters_ex(4, &pv_handle, &pv_which, &pv_opt, &pv_val) == FAILURE) { WRONG_PARAM_COUNT; } @@ -2172,11 +2172,11 @@ argc = ARG_COUNT(ht); if (argc == 1) { - if (getParametersEx(1, &pv_conn) == FAILURE) { + if (zend_get_parameters_ex(1, &pv_conn) == FAILURE) { WRONG_PARAM_COUNT; } } else if (argc == 5) { - if (getParametersEx(5, &pv_conn, &pv_cat, &pv_schema, &pv_table, &pv_type) == FAILURE) { + if (zend_get_parameters_ex(5, &pv_conn, &pv_cat, &pv_schema, &pv_table, &pv_type) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(pv_cat); @@ -2254,11 +2254,11 @@ argc = ARG_COUNT(ht); if (argc == 1) { - if (getParametersEx(1, &pv_conn) == FAILURE) { + if (zend_get_parameters_ex(1, &pv_conn) == FAILURE) { WRONG_PARAM_COUNT; } } else if (argc == 5) { - if (getParametersEx(5, &pv_conn, &pv_cat, &pv_schema, &pv_table, &pv_column) == FAILURE) { + if (zend_get_parameters_ex(5, &pv_conn, &pv_cat, &pv_schema, &pv_table, &pv_column) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(pv_cat); @@ -2337,7 +2337,7 @@ argc = ARG_COUNT(ht); if (argc == 5) { - if (getParametersEx(5, &pv_conn, &pv_cat, &pv_schema, &pv_table, &pv_column) == FAILURE) { + if (zend_get_parameters_ex(5, &pv_conn, &pv_cat, &pv_schema, &pv_table, &pv_column) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(pv_cat); @@ -2419,7 +2419,7 @@ argc = ARG_COUNT(ht); if (argc == 7) { - if (getParametersEx(7, &pv_conn, &pv_pcat, &pv_pschema, &pv_ptable, + if (zend_get_parameters_ex(7, &pv_conn, &pv_pcat, &pv_pschema, &pv_ptable, &pv_fcat, &pv_fschema, &pv_ftable) == FAILURE) { WRONG_PARAM_COUNT; } @@ -2516,11 +2516,11 @@ argc = ARG_COUNT(ht); if (argc == 1) { - if (getParametersEx(1, &pv_conn) == FAILURE) { + if (zend_get_parameters_ex(1, &pv_conn) == FAILURE) { WRONG_PARAM_COUNT; } } else if (argc == 2) { - if (getParametersEx(2, &pv_conn, &pv_data_type) == FAILURE) { + if (zend_get_parameters_ex(2, &pv_conn, &pv_data_type) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(pv_data_type); @@ -2588,7 +2588,7 @@ argc = ARG_COUNT(ht); if (argc == 4) { - if (getParametersEx(4, &pv_conn, &pv_cat, &pv_schema, &pv_table) == FAILURE) { + if (zend_get_parameters_ex(4, &pv_conn, &pv_cat, &pv_schema, &pv_table) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(pv_cat); @@ -2664,11 +2664,11 @@ argc = ARG_COUNT(ht); if (argc == 1) { - if (getParametersEx(1, &pv_conn) == FAILURE) { + if (zend_get_parameters_ex(1, &pv_conn) == FAILURE) { WRONG_PARAM_COUNT; } } else if (argc == 5) { - if (getParametersEx(5, &pv_conn, &pv_cat, &pv_schema, &pv_proc, &pv_col) == FAILURE) { + if (zend_get_parameters_ex(5, &pv_conn, &pv_cat, &pv_schema, &pv_proc, &pv_col) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(pv_cat); @@ -2748,11 +2748,11 @@ argc = ARG_COUNT(ht); if (argc == 1) { - if (getParametersEx(1, &pv_conn) == FAILURE) { + if (zend_get_parameters_ex(1, &pv_conn) == FAILURE) { WRONG_PARAM_COUNT; } } else if (argc == 4) { - if (getParametersEx(4, &pv_conn, &pv_cat, &pv_schema, &pv_proc) == FAILURE) { + if (zend_get_parameters_ex(4, &pv_conn, &pv_cat, &pv_schema, &pv_proc) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(pv_cat); @@ -2831,7 +2831,7 @@ argc = ARG_COUNT(ht); if (argc == 7) { - if (getParametersEx(7, &pv_conn, &pv_type, &pv_cat, &pv_schema, + if (zend_get_parameters_ex(7, &pv_conn, &pv_type, &pv_cat, &pv_schema, &pv_name, &pv_scope, &pv_nullable) == FAILURE) { WRONG_PARAM_COUNT; } @@ -2918,7 +2918,7 @@ argc = ARG_COUNT(ht); if (argc == 6) { - if (getParametersEx(6, &pv_conn, &pv_cat, &pv_schema, + if (zend_get_parameters_ex(6, &pv_conn, &pv_cat, &pv_schema, &pv_name, &pv_unique, &pv_reserved) == FAILURE) { WRONG_PARAM_COUNT; } @@ -3001,7 +3001,7 @@ argc = ARG_COUNT(ht); if (argc == 4) { - if (getParametersEx(4, &pv_conn, &pv_cat, &pv_schema, &pv_table) == FAILURE) { + if (zend_get_parameters_ex(4, &pv_conn, &pv_cat, &pv_schema, &pv_table) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(pv_cat); Index: php4/ext/oracle/oracle.c diff -u php4/ext/oracle/oracle.c:1.30 php4/ext/oracle/oracle.c:1.31 --- php4/ext/oracle/oracle.c:1.30 Fri Dec 17 15:55:16 1999 +++ php4/ext/oracle/oracle.c Sat Dec 18 17:35:18 1999 @@ -385,7 +385,7 @@ oraConnection *db_conn; ORALS_FETCH(); - if (getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } @@ -553,7 +553,7 @@ oraConnection *conn; pval **arg; - if (getParametersEx(1, &arg) == FAILURE) { + if (zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } ZEND_FETCH_RESOURCE2(conn, oraConnection *, arg, -1, "Oracle-Connection", le_conn, le_pconn); @@ -571,7 +571,7 @@ oraConnection *conn = NULL; oraCursor *cursor = NULL; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } ZEND_FETCH_RESOURCE2(conn, oraConnection *, arg, -1, "Oracle-Connection", le_conn, le_pconn); @@ -602,7 +602,7 @@ pval **arg; oraCursor *cursor; - if (getParametersEx(1, &arg) == FAILURE) { + if (zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } ZEND_FETCH_RESOURCE(cursor, oraCursor *, arg, -1, "Oracle-Cursor", le_cursor); @@ -620,7 +620,7 @@ pval **arg; oraConnection *conn; - if (getParametersEx(1, &arg) == FAILURE) { + if (zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } ZEND_FETCH_RESOURCE2(conn, oraConnection *, arg, -1, "Oracle-Connection", le_conn, le_pconn); @@ -641,7 +641,7 @@ pval **arg; oraConnection *conn; - if (getParametersEx(1, &arg) == FAILURE) { + if (zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } ZEND_FETCH_RESOURCE2(conn, oraConnection *, arg, -1, "Oracle-Connection", le_conn, le_pconn); @@ -662,7 +662,7 @@ pval **arg; oraConnection *conn; - if (getParametersEx(1, &arg) == FAILURE) { + if (zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } ZEND_FETCH_RESOURCE2(conn, oraConnection *, arg, -1, "Oracle-Connection", le_conn, le_pconn); @@ -683,7 +683,7 @@ pval **arg; oraConnection *conn; - if (getParametersEx(1, &arg) == FAILURE) { + if (zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } ZEND_FETCH_RESOURCE2(conn, oraConnection *, arg, -1, "Oracle-Connection", le_conn, le_pconn); @@ -708,14 +708,14 @@ switch (ARG_COUNT(ht)) { case 3: - getParametersEx(3,&curs,&sql,&def); + zend_get_parameters_ex(3,&curs,&sql,&def); convert_to_long_ex(def); if ((*def)->value.lval) { defer = DEFER_PARSE; } break; case 2: - getParametersEx(2,&curs,&sql); + zend_get_parameters_ex(2,&curs,&sql); break; default: WRONG_PARAM_COUNT; @@ -768,12 +768,12 @@ switch (ARG_COUNT(ht)) { case 5: - getParametersEx(5,&curs,&pvar,&svar,&plen,&ptyp); + zend_get_parameters_ex(5,&curs,&pvar,&svar,&plen,&ptyp); convert_to_long_ex(ptyp); inout = (*ptyp)->value.lval; break; case 4: - getParametersEx(4,&curs,&pvar,&svar,&plen); + zend_get_parameters_ex(4,&curs,&pvar,&svar,&plen); break; default: WRONG_PARAM_COUNT; @@ -866,7 +866,7 @@ pval **arg; oraCursor *cursor = NULL; - if (getParametersEx(1, &arg) == FAILURE) + if (zend_get_parameters_ex(1, &arg) == FAILURE) WRONG_PARAM_COUNT; if ((cursor = ora_get_cursor(list, arg)) == NULL) { @@ -908,7 +908,7 @@ pval **arg; oraCursor *cursor = NULL; - if (getParametersEx(1, &arg) == FAILURE) + if (zend_get_parameters_ex(1, &arg) == FAILURE) WRONG_PARAM_COUNT; if ((cursor = ora_get_cursor(list, arg)) == NULL) { @@ -926,7 +926,7 @@ pval **arg; oraCursor *cursor = NULL; - if(getParametersEx(1, &arg) == FAILURE) + if(zend_get_parameters_ex(1, &arg) == FAILURE) WRONG_PARAM_COUNT; if((cursor = ora_get_cursor(list, arg)) == NULL) { @@ -947,7 +947,7 @@ oraCursor *cursor = NULL; text *query; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &con,&sql) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &con,&sql) == FAILURE) { WRONG_PARAM_COUNT; } ZEND_FETCH_RESOURCE2(conn, oraConnection *, con, -1, "Oracle-Connection", le_conn, le_pconn); @@ -1023,7 +1023,7 @@ pval **arg; oraCursor *cursor; - if (getParametersEx(1, &arg) == FAILURE) { + if (zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1060,11 +1060,11 @@ switch(ARG_COUNT(ht)){ case 2: - getParametersEx(2, &curs, &arr); + zend_get_parameters_ex(2, &curs, &arr); break; case 3: - getParametersEx(3, &curs, &arr, &flg); + zend_get_parameters_ex(3, &curs, &arr, &flg); convert_to_long_ex(flg); flags = (*flg)->value.lval; break; @@ -1200,7 +1200,7 @@ pval **curs, **col; oraCursor *cursor = NULL; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &curs, &col) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &curs, &col) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1238,7 +1238,7 @@ int colno; oraCursor *cursor = NULL; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &curs, &col) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &curs, &col) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1306,7 +1306,7 @@ pval **curs, **col; oraCursor *cursor = NULL; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &curs, &col) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &curs, &col) == FAILURE) { WRONG_PARAM_COUNT; } /* Find the cursor */ @@ -1346,7 +1346,7 @@ int len; sb2 type; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &curs, &col) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &curs, &col) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1468,7 +1468,7 @@ void *res; int what; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } res = zend_fetch_resource(arg, -1,"Oracle-Connection/Cursor",&what,3,le_conn, le_pconn, le_cursor); @@ -1494,7 +1494,7 @@ void *res; int what; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } res = zend_fetch_resource(arg, -1,"Oracle-Connection/Cursor",&what,3,le_conn, le_pconn, le_cursor); Index: php4/ext/pcre/php_pcre.c diff -u php4/ext/pcre/php_pcre.c:1.32 php4/ext/pcre/php_pcre.c:1.33 --- php4/ext/pcre/php_pcre.c:1.32 Tue Dec 7 11:26:42 1999 +++ php4/ext/pcre/php_pcre.c Sat Dec 18 17:35:20 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.32 1999/12/07 16:26:42 andrei Exp $ */ +/* $Id: php_pcre.c,v 1.33 1999/12/18 22:35:20 zeev Exp $ */ /* TODO: @@ -330,13 +330,13 @@ /* Get function parameters and do error-checking. */ switch(ARG_COUNT(ht)) { case 2: - if (getParametersEx(2, &regex, &subject) == FAILURE) { + if (zend_get_parameters_ex(2, &regex, &subject) == FAILURE) { WRONG_PARAM_COUNT; } break; case 3: - if (getParametersEx(3, &regex, &subject, &subpats) == FAILURE) { + if (zend_get_parameters_ex(3, &regex, &subject, &subpats) == FAILURE) { WRONG_PARAM_COUNT; } if (global) @@ -348,7 +348,7 @@ break; case 4: - if (getParametersEx(4, &regex, &subject, &subpats, &subpats_order) == FAILURE) { + if (zend_get_parameters_ex(4, &regex, &subject, &subpats, &subpats_order) == FAILURE) { WRONG_PARAM_COUNT; } if (!ParameterPassedByReference(ht, 3)) { @@ -855,7 +855,7 @@ ulong num_key; /* Get function parameters and do error-checking. */ - if (ARG_COUNT(ht) != 3 || getParametersEx(3, &regex, &replace, &subject) == FAILURE) { + if (ARG_COUNT(ht) != 3 || zend_get_parameters_ex(3, &regex, &replace, &subject) == FAILURE) { WRONG_PARAM_COUNT; } @@ -933,7 +933,7 @@ /* Get function parameters and do error checking */ argc = ARG_COUNT(ht); - if (argc < 1 || argc > 4 || getParametersEx(argc, &regex, &subject, &limit, &flags) == FAILURE) { + if (argc < 1 || argc > 4 || zend_get_parameters_ex(argc, &regex, &subject, &limit, &flags) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1041,7 +1041,7 @@ c; /* Current character */ /* Get the arguments and check for errors */ - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &in_str_arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &in_str_arg) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1112,7 +1112,7 @@ /* Get arguments and do error checking */ - if (ARG_COUNT(ht) != 2 || getParametersEx(ARG_COUNT(ht), &regex, &input) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(ARG_COUNT(ht), &regex, &input) == FAILURE) { WRONG_PARAM_COUNT; } Index: php4/ext/pdf/pdf.c diff -u php4/ext/pdf/pdf.c:1.19 php4/ext/pdf/pdf.c:1.20 --- php4/ext/pdf/pdf.c:1.19 Fri Dec 17 15:55:17 1999 +++ php4/ext/pdf/pdf.c Sat Dec 18 17:35:21 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdf.c,v 1.19 1999/12/17 20:55:17 zeev Exp $ */ +/* $Id: pdf.c,v 1.20 1999/12/18 22:35:21 zeev Exp $ */ /* pdflib 2.01 is subject to the ALADDIN FREE PUBLIC LICENSE. Copyright (C) 1997 Thomas Merz. */ @@ -365,7 +365,7 @@ PDF *pdf; PDF_TLS_VARS; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &file) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &file) == FAILURE) { WRONG_PARAM_COUNT; } Index: php4/ext/readline/readline.c diff -u php4/ext/readline/readline.c:1.5 php4/ext/readline/readline.c:1.6 --- php4/ext/readline/readline.c:1.5 Wed Dec 8 06:48:10 1999 +++ php4/ext/readline/readline.c Sat Dec 18 17:35:22 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: readline.c,v 1.5 1999/12/08 11:48:10 thies Exp $ */ +/* $Id: readline.c,v 1.6 1999/12/18 22:35:22 zeev Exp $ */ /* {{{ includes & prototypes */ @@ -92,7 +92,7 @@ pval **arg; int ac = ARG_COUNT(ht); - if (ac < 0 || ac > 1 || getParametersEx(ac, &arg) == FAILURE) { + if (ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &arg) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(arg); @@ -121,7 +121,7 @@ char *oldstr; int ac = ARG_COUNT(ht); - if (ac < 0 || ac > 2 || getParametersEx(ac, &what, &value) == FAILURE) { + if (ac < 0 || ac > 2 || zend_get_parameters_ex(ac, &what, &value) == FAILURE) { WRONG_PARAM_COUNT; } @@ -206,7 +206,7 @@ pval **arg; int ac = ARG_COUNT(ht); - if (ac < 1 || ac > 1 || getParametersEx(ac, &arg) == FAILURE) { + if (ac < 1 || ac > 1 || zend_get_parameters_ex(ac, &arg) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(arg); @@ -265,7 +265,7 @@ char *filename = NULL; int ac = ARG_COUNT(ht); - if (ac < 0 || ac > 1 || getParametersEx(ac, &arg) == FAILURE) { + if (ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &arg) == FAILURE) { WRONG_PARAM_COUNT; } @@ -292,7 +292,7 @@ char *filename = NULL; int ac = ARG_COUNT(ht); - if (ac < 0 || ac > 1 || getParametersEx(ac, &arg) == FAILURE) { + if (ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &arg) == FAILURE) { WRONG_PARAM_COUNT; } @@ -391,7 +391,7 @@ pval **arg; int ac = ARG_COUNT(ht); - if (ac < 0 || ac > 1 || getParametersEx(ac, &arg) == FAILURE) { + if (ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &arg) == FAILURE) { WRONG_PARAM_COUNT; } Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.83 php4/ext/session/session.c:1.84 --- php4/ext/session/session.c:1.83 Fri Dec 17 23:01:13 1999 +++ php4/ext/session/session.c Sat Dec 18 17:35:23 1999 @@ -749,7 +749,7 @@ old = estrdup(PS(session_name)); - if(ac < 0 || ac > 1 || getParametersEx(ac, &p_name) == FAILURE) { + if(ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &p_name) == FAILURE) { WRONG_PARAM_COUNT; } @@ -774,7 +774,7 @@ old = estrdup(PS(mod)->name); - if(ac < 0 || ac > 1 || getParametersEx(ac, &p_name) == FAILURE) { + if(ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &p_name) == FAILURE) { WRONG_PARAM_COUNT; } @@ -808,7 +808,7 @@ ps_user *mdata; PSLS_FETCH(); - if(ARG_COUNT(ht) != 6 || getParametersArrayEx(6, args) == FAILURE) { + if(ARG_COUNT(ht) != 6 || zend_get_parameters_array_ex(6, args) == FAILURE) { WRONG_PARAM_COUNT; } @@ -842,7 +842,7 @@ old = estrdup(PS(save_path)); - if(ac < 0 || ac > 1 || getParametersEx(ac, &p_name) == FAILURE) { + if(ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &p_name) == FAILURE) { WRONG_PARAM_COUNT; } @@ -868,7 +868,7 @@ if(PS(id)) old = estrdup(PS(id)); - if(ac < 0 || ac > 1 || getParametersEx(ac, &p_name) == FAILURE) { + if(ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &p_name) == FAILURE) { WRONG_PARAM_COUNT; } @@ -919,7 +919,7 @@ } else args = (zval ***)emalloc(argc * sizeof(zval **)); - if (getParametersArrayEx(argc, args) == FAILURE) { + if (zend_get_parameters_array_ex(argc, args) == FAILURE) { efree(args); WRONG_PARAM_COUNT; } @@ -948,7 +948,7 @@ int ac = ARG_COUNT(ht); PSLS_FETCH(); - if(ac != 1 || getParametersEx(ac, &p_name) == FAILURE) { + if(ac != 1 || zend_get_parameters_ex(ac, &p_name) == FAILURE) { WRONG_PARAM_COUNT; } @@ -970,7 +970,7 @@ int ac = ARG_COUNT(ht); PSLS_FETCH(); - if(ac != 1 || getParametersEx(ac, &p_name) == FAILURE) { + if(ac != 1 || zend_get_parameters_ex(ac, &p_name) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1006,7 +1006,7 @@ pval **str; PSLS_FETCH(); - if(ARG_COUNT(ht) != 1 || getParametersEx(1, &str) == FAILURE) { + if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str) == FAILURE) { WRONG_PARAM_COUNT; } Index: php4/ext/standard/array.c diff -u php4/ext/standard/array.c:1.14 php4/ext/standard/array.c:1.15 --- php4/ext/standard/array.c:1.14 Mon Dec 13 14:42:26 1999 +++ php4/ext/standard/array.c Sat Dec 18 17:35:26 1999 @@ -202,7 +202,7 @@ pval **array; HashTable *target_hash; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) { WRONG_PARAM_COUNT; } target_hash = HASH_OF(*array); @@ -221,7 +221,7 @@ pval **array; HashTable *target_hash; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) { WRONG_PARAM_COUNT; } target_hash = HASH_OF(*array); @@ -241,7 +241,7 @@ pval **array; HashTable *target_hash; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) { WRONG_PARAM_COUNT; } target_hash = HASH_OF(*array); @@ -310,7 +310,7 @@ pval **array; HashTable *target_hash; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) { WRONG_PARAM_COUNT; } target_hash = HASH_OF(*array); @@ -329,7 +329,7 @@ pval **array; HashTable *target_hash; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) { WRONG_PARAM_COUNT; } target_hash = HASH_OF(*array); @@ -348,7 +348,7 @@ pval **array; HashTable *target_hash; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) { WRONG_PARAM_COUNT; } target_hash = HASH_OF(*array); @@ -367,7 +367,7 @@ pval **array; HashTable *target_hash; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) { WRONG_PARAM_COUNT; } target_hash = HASH_OF(*array); @@ -414,7 +414,7 @@ BLS_FETCH(); old_compare_func = BG(user_compare_func_name); - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &array, &BG(user_compare_func_name)) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &array, &BG(user_compare_func_name)) == FAILURE) { BG(user_compare_func_name) = old_compare_func; WRONG_PARAM_COUNT; } @@ -441,7 +441,7 @@ BLS_FETCH(); old_compare_func = BG(user_compare_func_name); - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &array, &BG(user_compare_func_name)) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &array, &BG(user_compare_func_name)) == FAILURE) { BG(user_compare_func_name) = old_compare_func; WRONG_PARAM_COUNT; } @@ -519,7 +519,7 @@ BLS_FETCH(); old_compare_func = BG(user_compare_func_name); - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &array, &BG(user_compare_func_name)) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &array, &BG(user_compare_func_name)) == FAILURE) { BG(user_compare_func_name) = old_compare_func; WRONG_PARAM_COUNT; } @@ -543,7 +543,7 @@ pval **array, **entry; HashTable *target_hash; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) { WRONG_PARAM_COUNT; } target_hash = HASH_OF(*array); @@ -569,7 +569,7 @@ pval **array, **entry; HashTable *target_hash; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) { WRONG_PARAM_COUNT; } target_hash = HASH_OF(*array); @@ -595,7 +595,7 @@ pval **array, **entry; HashTable *target_hash; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) { WRONG_PARAM_COUNT; } target_hash = HASH_OF(*array); @@ -621,7 +621,7 @@ pval **array, **entry; HashTable *target_hash; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) { WRONG_PARAM_COUNT; } target_hash = HASH_OF(*array); @@ -646,7 +646,7 @@ pval **array, **entry; HashTable *target_hash; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) { WRONG_PARAM_COUNT; } target_hash = HASH_OF(*array); @@ -669,7 +669,7 @@ ulong num_key; HashTable *target_hash; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) { WRONG_PARAM_COUNT; } target_hash = HASH_OF(*array); @@ -706,7 +706,7 @@ if (argc == 1) { pval **arr; - if (getParametersEx(1, &arr) == FAILURE || (*arr)->type != IS_ARRAY) { + if (zend_get_parameters_ex(1, &arr) == FAILURE || (*arr)->type != IS_ARRAY) { WRONG_PARAM_COUNT; } if (zend_hash_minmax((*arr)->value.ht, array_data_compare, 0, (void **) &result)==SUCCESS) { @@ -721,7 +721,7 @@ pval **min, result; int i; - if (getParametersArrayEx(ARG_COUNT(ht), args)==FAILURE) { + if (zend_get_parameters_array_ex(ARG_COUNT(ht), args)==FAILURE) { efree(args); WRONG_PARAM_COUNT; } @@ -756,7 +756,7 @@ if (argc == 1) { pval **arr; - if (getParametersEx(1, &arr) == FAILURE || (*arr)->type != IS_ARRAY) { + if (zend_get_parameters_ex(1, &arr) == FAILURE || (*arr)->type != IS_ARRAY) { WRONG_PARAM_COUNT; } if (zend_hash_minmax((*arr)->value.ht, array_data_compare, 1, (void **) &result)==SUCCESS) { @@ -771,7 +771,7 @@ pval **max, result; int i; - if (getParametersArrayEx(ARG_COUNT(ht), args)==FAILURE) { + if (zend_get_parameters_array_ex(ARG_COUNT(ht), args)==FAILURE) { efree(args); WRONG_PARAM_COUNT; } @@ -849,7 +849,7 @@ argc = ARG_COUNT(ht); old_walk_func_name = BG(array_walk_func_name); if (argc < 2 || argc > 3 || - getParametersEx(argc, &array, &BG(array_walk_func_name), &userdata) == FAILURE) { + zend_get_parameters_ex(argc, &array, &BG(array_walk_func_name), &userdata) == FAILURE) { BG(array_walk_func_name) = old_walk_func_name; WRONG_PARAM_COUNT; } @@ -877,7 +877,7 @@ res; /* comparison result */ HashTable *target_hash; /* array hashtable */ - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &value, &array) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &value, &array) == FAILURE) { WRONG_PARAM_COUNT; } @@ -947,14 +947,14 @@ switch(ARG_COUNT(ht)) { case 1: - if (getParametersEx(1, &var_array) == FAILURE) { + if (zend_get_parameters_ex(1, &var_array) == FAILURE) { WRONG_PARAM_COUNT; } extype = EXTR_OVERWRITE; break; case 2: - if (getParametersEx(2, &var_array, &etype) == FAILURE) { + if (zend_get_parameters_ex(2, &var_array, &etype) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(etype); @@ -965,7 +965,7 @@ break; case 3: - if (getParametersEx(3, &var_array, &etype, &prefix) == FAILURE) { + if (zend_get_parameters_ex(3, &var_array, &etype, &prefix) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(etype); @@ -1084,7 +1084,7 @@ args = (zval ***)emalloc(ARG_COUNT(ht) * sizeof(zval **)); - if (getParametersArrayEx(ARG_COUNT(ht), args) == FAILURE) { + if (zend_get_parameters_array_ex(ARG_COUNT(ht), args) == FAILURE) { efree(args); WRONG_PARAM_COUNT; } @@ -1107,7 +1107,7 @@ zval **zlow, **zhigh; int low, high; - if (ARG_COUNT(ht) != 2 || getParametersEx(2,&zlow,&zhigh) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2,&zlow,&zhigh) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(zlow); @@ -1149,7 +1149,7 @@ { zval **array; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) { WRONG_PARAM_COUNT; } if ((*array)->type != IS_ARRAY) { @@ -1272,7 +1272,7 @@ /* Allocate arguments array and get the arguments, checking for errors. */ args = (zval ***)emalloc(argc * sizeof(zval **)); - if (getParametersArrayEx(argc, args) == FAILURE) { + if (zend_get_parameters_array_ex(argc, args) == FAILURE) { efree(args); WRONG_PARAM_COUNT; } @@ -1308,7 +1308,7 @@ HashTable *new_hash; /* New stack */ /* Get the arguments and do error-checking */ - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &stack) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &stack) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1376,7 +1376,7 @@ /* Allocate arguments array and get the arguments, checking for errors. */ args = (zval ***)emalloc(argc * sizeof(zval **)); - if (getParametersArrayEx(argc, args) == FAILURE) { + if (zend_get_parameters_array_ex(argc, args) == FAILURE) { efree(args); WRONG_PARAM_COUNT; } @@ -1426,7 +1426,7 @@ /* Allocate arguments array and get the arguments, checking for errors. */ args = (zval ***)emalloc(argc * sizeof(zval **)); - if (getParametersArrayEx(argc, args) == FAILURE) { + if (zend_get_parameters_array_ex(argc, args) == FAILURE) { efree(args); WRONG_PARAM_COUNT; } @@ -1502,7 +1502,7 @@ /* Get the arguments and do error-checking */ argc = ARG_COUNT(ht); - if (argc < 2 || argc > 3 || getParametersEx(argc, &input, &offset, &length)) { + if (argc < 2 || argc > 3 || zend_get_parameters_ex(argc, &input, &offset, &length)) { WRONG_PARAM_COUNT; } @@ -1597,7 +1597,7 @@ /* Allocate arguments array and get the arguments, checking for errors. */ args = (zval ***)emalloc(argc * sizeof(zval **)); - if (getParametersArrayEx(argc, args) == FAILURE) { + if (zend_get_parameters_array_ex(argc, args) == FAILURE) { efree(args); WRONG_PARAM_COUNT; } @@ -1655,7 +1655,7 @@ /* Get arguments and do error-checking */ if (ARG_COUNT(ht) < 1 || ARG_COUNT(ht) > 2 || - getParametersEx(ARG_COUNT(ht), &input, &search_value) == FAILURE) { + zend_get_parameters_ex(ARG_COUNT(ht), &input, &search_value) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1711,7 +1711,7 @@ **entry; /* An entry in the input array */ /* Get arguments and do error-checking */ - if (ARG_COUNT(ht) != 1 || getParametersEx(ARG_COUNT(ht), &input) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(ARG_COUNT(ht), &input) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1747,7 +1747,7 @@ HashTable *myht; /* Get arguments and do error-checking */ - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &input) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &input) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1808,7 +1808,7 @@ ulong num_key; /* Get arguments and do error-checking */ - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &input) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &input) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1859,7 +1859,7 @@ int i; /* Get arguments and do error-checking */ - if (ARG_COUNT(ht) != 3 || getParametersEx(3, &input, &pad_size, &pad_value) == FAILURE) { + if (ARG_COUNT(ht) != 3 || zend_get_parameters_ex(3, &input, &pad_size, &pad_value) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1916,7 +1916,7 @@ char *string_key; ulong num_key; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) { WRONG_PARAM_COUNT; } @@ -2009,7 +2009,7 @@ /* Allocate arguments array and get the arguments, checking for errors. */ args = (zval ***)emalloc(argc * sizeof(zval **)); - if (getParametersArrayEx(argc, args) == FAILURE) { + if (zend_get_parameters_array_ex(argc, args) == FAILURE) { efree(args); WRONG_PARAM_COUNT; } Index: php4/ext/standard/assert.c diff -u php4/ext/standard/assert.c:1.10 php4/ext/standard/assert.c:1.11 --- php4/ext/standard/assert.c:1.10 Wed Dec 8 14:07:58 1999 +++ php4/ext/standard/assert.c Sat Dec 18 17:35:27 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: assert.c,v 1.10 1999/12/08 19:07:58 sas Exp $ */ +/* $Id: assert.c,v 1.11 1999/12/18 22:35:27 zeev Exp $ */ /* {{{ includes/startup/misc */ @@ -174,7 +174,7 @@ RETURN_TRUE; } - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &assertion) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &assertion) == FAILURE) { WRONG_PARAM_COUNT; } @@ -279,7 +279,7 @@ int ac = ARG_COUNT(ht); ASSERTLS_FETCH(); - if (ac < 1 || ac > 2 || getParametersEx(ac, &what, &value) == FAILURE) { + if (ac < 1 || ac > 2 || zend_get_parameters_ex(ac, &what, &value) == FAILURE) { WRONG_PARAM_COUNT; } Index: php4/ext/standard/base64.c diff -u php4/ext/standard/base64.c:1.11 php4/ext/standard/base64.c:1.12 --- php4/ext/standard/base64.c:1.11 Fri Dec 17 15:55:24 1999 +++ php4/ext/standard/base64.c Sat Dec 18 17:35:27 1999 @@ -15,7 +15,7 @@ | Author: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: base64.c,v 1.11 1999/12/17 20:55:24 zeev Exp $ */ +/* $Id: base64.c,v 1.12 1999/12/18 22:35:27 zeev Exp $ */ #include <string.h> @@ -146,7 +146,7 @@ unsigned char *result; int ret_length; - if (ARG_COUNT(ht)!=1 || getParametersEx(1,&string) == FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1,&string) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(string); @@ -169,7 +169,7 @@ unsigned char *result; int ret_length; - if (ARG_COUNT(ht)!=1 || getParametersEx(1,&string) == FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1,&string) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(string); Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.141 php4/ext/standard/basic_functions.c:1.142 --- php4/ext/standard/basic_functions.c:1.141 Fri Dec 17 23:01:14 1999 +++ php4/ext/standard/basic_functions.c Sat Dec 18 17:35:27 1999 @@ -445,7 +445,7 @@ SLS_FETCH(); #endif - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(str); @@ -494,7 +494,7 @@ pval **str; BLS_FETCH(); - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(str); @@ -547,13 +547,13 @@ switch(ARG_COUNT(ht)) { case 1: - if (getParametersEx(1, &num) == FAILURE) { + if (zend_get_parameters_ex(1, &num) == FAILURE) { WRONG_PARAM_COUNT; } base = 10; break; case 2: - if (getParametersEx(2, &num, &arg_base) == FAILURE) { + if (zend_get_parameters_ex(2, &num, &arg_base) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg_base); @@ -572,7 +572,7 @@ { pval **num; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) { WRONG_PARAM_COUNT; } *return_value=**num; @@ -585,7 +585,7 @@ { pval **num; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) { WRONG_PARAM_COUNT; } *return_value=**num; @@ -622,7 +622,7 @@ { pval **num; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(num); @@ -634,7 +634,7 @@ #if HAVE_USLEEP pval **num; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(num); @@ -646,7 +646,7 @@ { pval **arg; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } switch ((*arg)->type) { @@ -694,7 +694,7 @@ pval **var, **type; char *new_type; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &var, &type) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &var, &type) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(type); @@ -734,7 +734,7 @@ pval **varname; char *value; - if (ARG_COUNT(ht)!=1 || getParametersEx(1, &varname)==FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &varname)==FAILURE) { WRONG_PARAM_COUNT; } @@ -751,7 +751,7 @@ pval **new_setting; PLS_FETCH(); - if (ARG_COUNT(ht)!=1 || getParametersEx(1, &new_setting)==FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &new_setting)==FAILURE) { RETURN_FALSE; } convert_to_boolean_ex(new_setting); @@ -779,7 +779,7 @@ { pval **arg; - if (ARG_COUNT(ht)!=1 || getParametersEx(1, &arg)==FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &arg)==FAILURE) { RETURN_FALSE; } if ((*arg)->type == type) { @@ -847,13 +847,13 @@ switch(ARG_COUNT(ht)) { case 1: - if (getParametersEx(1,&string) == FAILURE) { + if (zend_get_parameters_ex(1,&string) == FAILURE) { php_error(E_WARNING,"Invalid argument 1 in error_log"); RETURN_FALSE; } break; case 2: - if (getParametersEx(2,&string,&erropt) == FAILURE) { + if (zend_get_parameters_ex(2,&string,&erropt) == FAILURE) { php_error(E_WARNING,"Invalid arguments in error_log"); RETURN_FALSE; } @@ -861,7 +861,7 @@ opt_err=(*erropt)->value.lval; break; case 3: - if (getParametersEx(3,&string,&erropt,&option) == FAILURE){ + if (zend_get_parameters_ex(3,&string,&erropt,&option) == FAILURE){ php_error(E_WARNING,"Invalid arguments in error_log"); RETURN_FALSE; } @@ -871,7 +871,7 @@ opt=(*option)->value.str.val; break; case 4: - if (getParametersEx(4,&string,&erropt,&option,&emailhead) == FAILURE){ + if (zend_get_parameters_ex(4,&string,&erropt,&option,&emailhead) == FAILURE){ php_error(E_WARNING,"Invalid arguments in error_log"); RETURN_FALSE; } @@ -952,7 +952,7 @@ } params = (pval ***) emalloc(sizeof(pval **)*arg_count); - if (getParametersArrayEx(arg_count, params)==FAILURE) { + if (zend_get_parameters_array_ex(arg_count, params)==FAILURE) { efree(params); RETURN_FALSE; } @@ -979,7 +979,7 @@ } params = (pval ***) emalloc(sizeof(pval **)*arg_count); - if (getParametersArrayEx(arg_count, params)==FAILURE) { + if (zend_get_parameters_array_ex(arg_count, params)==FAILURE) { efree(params); RETURN_FALSE; } @@ -1077,7 +1077,7 @@ zend_syntax_highlighter_ini syntax_highlighter_ini; - if (ARG_COUNT(ht)!=1 || getParametersEx(1, &filename)==FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &filename)==FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(filename); @@ -1099,7 +1099,7 @@ pval **expr; zend_syntax_highlighter_ini syntax_highlighter_ini; - if (ARG_COUNT(ht)!=1 || getParametersEx(1, &expr)==FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &expr)==FAILURE) { WRONG_PARAM_COUNT; } @@ -1243,7 +1243,7 @@ { pval **varname; - if (ARG_COUNT(ht)!=1 || getParametersEx(1, &varname)==FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &varname)==FAILURE) { WRONG_PARAM_COUNT; } @@ -1266,7 +1266,7 @@ pval **varname, **new_value; char *old_value; - if (ARG_COUNT(ht)!=2 || getParametersEx(2, &varname, &new_value)==FAILURE) { + if (ARG_COUNT(ht)!=2 || zend_get_parameters_ex(2, &varname, &new_value)==FAILURE) { WRONG_PARAM_COUNT; } @@ -1291,7 +1291,7 @@ { pval **varname; - if (ARG_COUNT(ht)!=1 || getParametersEx(1, &varname)==FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &varname)==FAILURE) { WRONG_PARAM_COUNT; } @@ -1305,7 +1305,7 @@ { pval **expr; - if (ARG_COUNT(ht)!=1 || getParametersEx(1, &expr)==FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &expr)==FAILURE) { WRONG_PARAM_COUNT; } @@ -1360,7 +1360,7 @@ case 0: break; case 1: - if (getParametersEx(1, &arg) == FAILURE) { + if (zend_get_parameters_ex(1, &arg) == FAILURE) { RETURN_FALSE; } convert_to_boolean_ex(arg); @@ -1381,7 +1381,7 @@ pval **name,**proto; struct servent *serv; - if(ARG_COUNT(ht) != 2 || getParametersEx(2,&name,&proto) == FAILURE) { + if(ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2,&name,&proto) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(name); @@ -1404,7 +1404,7 @@ pval **port,**proto; struct servent *serv; - if(ARG_COUNT(ht) != 2 || getParametersEx(2,&port,&proto) == FAILURE) { + if(ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2,&port,&proto) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(port); @@ -1427,7 +1427,7 @@ pval **name; struct protoent *ent; - if(ARG_COUNT(ht) != 1 || getParametersEx(1, &name) == FAILURE) { + if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &name) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1453,7 +1453,7 @@ pval **proto; struct protoent *ent; - if(ARG_COUNT(ht) != 1 || getParametersEx(1, &proto) == FAILURE) { + if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &proto) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1496,7 +1496,7 @@ { zval **extension_name; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &extension_name)) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &extension_name)) { WRONG_PARAM_COUNT; } @@ -1518,7 +1518,7 @@ zend_module_entry *module; zend_function_entry *func; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &extension_name)) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &extension_name)) { WRONG_PARAM_COUNT; } Index: php4/ext/standard/crypt.c diff -u php4/ext/standard/crypt.c:1.13 php4/ext/standard/crypt.c:1.14 --- php4/ext/standard/crypt.c:1.13 Fri Dec 17 23:01:14 1999 +++ php4/ext/standard/crypt.c Sat Dec 18 17:35:27 1999 @@ -17,7 +17,7 @@ | Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: crypt.c,v 1.13 1999/12/18 04:01:14 zeev Exp $ */ +/* $Id: crypt.c,v 1.14 1999/12/18 22:35:27 zeev Exp $ */ #include <stdlib.h> #include "php.h" @@ -129,12 +129,12 @@ switch (ARG_COUNT(ht)) { case 1: - if (getParametersEx(1, &arg1)==FAILURE) { + if (zend_get_parameters_ex(1, &arg1)==FAILURE) { RETURN_FALSE; } break; case 2: - if (getParametersEx(2, &arg1, &arg2)==FAILURE) { + if (zend_get_parameters_ex(2, &arg1, &arg2)==FAILURE) { RETURN_FALSE; } convert_to_string_ex(arg2); Index: php4/ext/standard/dir.c diff -u php4/ext/standard/dir.c:1.22 php4/ext/standard/dir.c:1.23 --- php4/ext/standard/dir.c:1.22 Fri Dec 17 23:01:14 1999 +++ php4/ext/standard/dir.c Sat Dec 18 17:35:27 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dir.c,v 1.22 1999/12/18 04:01:14 zeev Exp $ */ +/* $Id: dir.c,v 1.23 1999/12/18 22:35:27 zeev Exp $ */ /* {{{ includes/startup/misc */ @@ -76,7 +76,7 @@ } else { \ ZEND_FETCH_RESOURCE(dirp,php_dir *,0,DIR(default_dir), "Directory", le_dirp); \ } \ - } else if ((ARG_COUNT(ht) != 1) || getParametersEx(1, &id) == FAILURE) { \ + } else if ((ARG_COUNT(ht) != 1) || zend_get_parameters_ex(1, &id) == FAILURE) { \ WRONG_PARAM_COUNT; \ } else { \ ZEND_FETCH_RESOURCE(dirp,php_dir *,id,-1, "Directory", le_dirp); \ @@ -146,7 +146,7 @@ php_dir *dirp; DIRLS_FETCH(); - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(arg); @@ -221,7 +221,7 @@ pval **arg; int ret; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(arg); Index: php4/ext/standard/dl.c diff -u php4/ext/standard/dl.c:1.18 php4/ext/standard/dl.c:1.19 --- php4/ext/standard/dl.c:1.18 Fri Dec 17 17:34:01 1999 +++ php4/ext/standard/dl.c Sat Dec 18 17:35:27 1999 @@ -60,7 +60,7 @@ PLS_FETCH(); /* obtain arguments */ - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &file) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &file) == FAILURE) { WRONG_PARAM_COUNT; } Index: php4/ext/standard/dns.c diff -u php4/ext/standard/dns.c:1.9 php4/ext/standard/dns.c:1.10 --- php4/ext/standard/dns.c:1.9 Fri Dec 17 23:01:14 1999 +++ php4/ext/standard/dns.c Sat Dec 18 17:35:27 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dns.c,v 1.9 1999/12/18 04:01:14 zeev Exp $ */ +/* $Id: dns.c,v 1.10 1999/12/18 22:35:27 zeev Exp $ */ #include "php.h" #if HAVE_SYS_SOCKET_H @@ -57,7 +57,7 @@ { pval **arg; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(arg); @@ -96,7 +96,7 @@ { pval **arg; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(arg); @@ -116,7 +116,7 @@ struct in_addr in; int i; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(arg); @@ -173,14 +173,14 @@ switch (ARG_COUNT(ht)) { case 1: - if (getParametersEx(1, &arg1) == FAILURE) { + if (zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } type = T_MX; convert_to_string_ex(arg1); break; case 2: - if (getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(arg1); Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.51 php4/ext/standard/file.c:1.52 --- php4/ext/standard/file.c:1.51 Fri Dec 17 23:01:14 1999 +++ php4/ext/standard/file.c Sat Dec 18 17:35:27 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.51 1999/12/18 04:01:14 zeev Exp $ */ +/* $Id: file.c,v 1.52 1999/12/18 22:35:27 zeev Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -346,7 +346,7 @@ int type, fd, act; void *what; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } @@ -396,12 +396,12 @@ /* check args */ switch (ARG_COUNT(ht)) { case 1: - if (getParametersEx(1,&filename) == FAILURE) { + if (zend_get_parameters_ex(1,&filename) == FAILURE) { WRONG_PARAM_COUNT; } break; case 2: - if (getParametersEx(2,&filename,&arg2) == FAILURE) { + if (zend_get_parameters_ex(2,&filename,&arg2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg2); @@ -526,12 +526,12 @@ /* check args */ switch (ARG_COUNT(ht)) { case 1: - if (getParametersEx(1,&filename) == FAILURE) { + if (zend_get_parameters_ex(1,&filename) == FAILURE) { WRONG_PARAM_COUNT; } break; case 2: - if (getParametersEx(2,&filename,&arg2) == FAILURE) { + if (zend_get_parameters_ex(2,&filename,&arg2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg2); @@ -588,7 +588,7 @@ char *t; char p[64]; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(arg1); @@ -637,12 +637,12 @@ switch(ARG_COUNT(ht)) { case 2: - if (getParametersEx(2,&arg1,&arg2) == FAILURE) { + if (zend_get_parameters_ex(2,&arg1,&arg2) == FAILURE) { WRONG_PARAM_COUNT; } break; case 3: - if (getParametersEx(3,&arg1,&arg2,&arg3) == FAILURE) { + if (zend_get_parameters_ex(3,&arg1,&arg2,&arg3) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg3); @@ -693,7 +693,7 @@ int type; void *what; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } @@ -716,7 +716,7 @@ char *b, buf[1024]; PLS_FETCH(); - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(arg1); @@ -769,7 +769,7 @@ void *what; FIL_FETCH(); - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } @@ -792,7 +792,7 @@ int socketd=0; void *what; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } what = zend_fetch_resource(arg1,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket); @@ -850,7 +850,7 @@ int socketd = 0; void *what; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } @@ -915,7 +915,7 @@ void *what; PLS_FETCH(); - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } @@ -958,7 +958,7 @@ int socketd=0; void *what; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } @@ -998,12 +998,12 @@ switch(ARG_COUNT(ht)) { case 2: - if (getParametersEx(2, &fd, &bytes) == FAILURE) { + if (zend_get_parameters_ex(2, &fd, &bytes) == FAILURE) { RETURN_FALSE; } break; case 3: - if (getParametersEx(3, &fd, &bytes, &allow) == FAILURE) { + if (zend_get_parameters_ex(3, &fd, &bytes, &allow) == FAILURE) { RETURN_FALSE; } convert_to_string_ex(allow); @@ -1055,14 +1055,14 @@ switch (ARG_COUNT(ht)) { case 2: - if (getParametersEx(2, &arg1, &arg2)==FAILURE) { + if (zend_get_parameters_ex(2, &arg1, &arg2)==FAILURE) { RETURN_FALSE; } convert_to_string_ex(arg2); num_bytes = (*arg2)->value.str.len; break; case 3: - if (getParametersEx(3, &arg1, &arg2, &arg3)==FAILURE) { + if (zend_get_parameters_ex(3, &arg1, &arg2, &arg3)==FAILURE) { RETURN_FALSE; } convert_to_string_ex(arg2); @@ -1108,7 +1108,7 @@ switch (ARG_COUNT(ht)) { case 2: - if (getParametersEx(2, &arg1, &arg2)==FAILURE) { + if (zend_get_parameters_ex(2, &arg1, &arg2)==FAILURE) { RETURN_FALSE; } break; @@ -1143,7 +1143,7 @@ pval **arg1; void *what; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1163,7 +1163,7 @@ pval **arg1; void *what; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1182,7 +1182,7 @@ pval **arg1, **arg2; void *what; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1204,7 +1204,7 @@ int ret,mode; PLS_FETCH(); - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(arg1); @@ -1231,7 +1231,7 @@ int ret; PLS_FETCH(); - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(arg1); @@ -1307,12 +1307,12 @@ /* check args */ switch (ARG_COUNT(ht)) { case 1: - if (getParametersEx(1,&arg1) == FAILURE) { + if (zend_get_parameters_ex(1,&arg1) == FAILURE) { WRONG_PARAM_COUNT; } break; case 2: - if (getParametersEx(2,&arg1,&arg2) == FAILURE) { + if (zend_get_parameters_ex(2,&arg1,&arg2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg2); @@ -1363,7 +1363,7 @@ if (arg_count == 0) { umask(oldumask); } else { - if (arg_count > 1 || getParametersEx(1, &arg1) == FAILURE) { + if (arg_count > 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg1); @@ -1387,7 +1387,7 @@ int socketd=0; void *what; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1419,7 +1419,7 @@ int ret; PLS_FETCH(); - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &old_arg, &new_arg) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &old_arg, &new_arg) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1453,7 +1453,7 @@ int fd_s,fd_t,read_bytes; PLS_FETCH(); - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &source, &target) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &source, &target) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1510,7 +1510,7 @@ void *what; PLS_FETCH(); - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1559,13 +1559,13 @@ switch(ARG_COUNT(ht)) { case 2: - if (getParametersEx(2, &fd, &bytes) == FAILURE) { + if (zend_get_parameters_ex(2, &fd, &bytes) == FAILURE) { WRONG_PARAM_COUNT; } break; case 3: - if (getParametersEx(3, &fd, &bytes, &p_delim) == FAILURE) { + if (zend_get_parameters_ex(3, &fd, &bytes, &p_delim) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(p_delim); @@ -1686,7 +1686,7 @@ return; } else if(ARG_COUNT(ht) == 1) { - if(getParametersEx(1, &arg) == FAILURE) { + if(zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } what = zend_fetch_resource(arg,-1,"select",&type,3,le_fopen,le_socket,le_popen); @@ -1703,7 +1703,7 @@ else { pval ***args = (pval ***) emalloc(sizeof(pval **) * ARG_COUNT(ht)); int i; - if(getParametersArrayEx(ARG_COUNT(ht), args) == FAILURE) { + if(zend_get_parameters_array_ex(ARG_COUNT(ht), args) == FAILURE) { efree(args); WRONG_PARAM_COUNT; } @@ -1729,7 +1729,7 @@ pval **timeout; struct timeval tv; - if(ARG_COUNT(ht) != 1 || getParametersEx(1, &timeout) == FAILURE) { + if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &timeout) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1747,7 +1747,7 @@ void *what; int type, fd; - if(ARG_COUNT(ht) != 1 || getParametersEx(1, &fdarg) == FAILURE) { + if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &fdarg) == FAILURE) { WRONG_PARAM_COUNT; } Index: php4/ext/standard/formatted_print.c diff -u php4/ext/standard/formatted_print.c:1.13 php4/ext/standard/formatted_print.c:1.14 --- php4/ext/standard/formatted_print.c:1.13 Fri Dec 17 23:01:14 1999 +++ php4/ext/standard/formatted_print.c Sat Dec 18 17:35:27 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: formatted_print.c,v 1.13 1999/12/18 04:01:14 zeev Exp $ */ +/* $Id: formatted_print.c,v 1.14 1999/12/18 22:35:27 zeev Exp $ */ #include <math.h> /* modf() */ #include "php.h" @@ -378,7 +378,7 @@ } args = (pval ***)emalloc(argc * sizeof(pval *)); - if (getParametersArrayEx(argc, args) == FAILURE) { + if (zend_get_parameters_array_ex(argc, args) == FAILURE) { efree(args); WRONG_PARAM_COUNT_WITH_RETVAL(NULL); } Index: php4/ext/standard/html.c diff -u php4/ext/standard/html.c:1.9 php4/ext/standard/html.c:1.10 --- php4/ext/standard/html.c:1.9 Fri Dec 17 23:01:14 1999 +++ php4/ext/standard/html.c Sat Dec 18 17:35:27 1999 @@ -50,7 +50,7 @@ unsigned char *old; char *new; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } @@ -131,7 +131,7 @@ int inx; char ind[ 2 ]; - if (ac < 0 || ac > 1 || getParametersEx(ac, &whichone) == FAILURE) { + if (ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &whichone) == FAILURE) { WRONG_PARAM_COUNT; } Index: php4/ext/standard/image.c diff -u php4/ext/standard/image.c:1.10 php4/ext/standard/image.c:1.11 --- php4/ext/standard/image.c:1.10 Fri Dec 17 23:01:14 1999 +++ php4/ext/standard/image.c Sat Dec 18 17:35:27 1999 @@ -15,7 +15,7 @@ | Authors: Rasmus Lerdorf | +----------------------------------------------------------------------+ */ -/* $Id: image.c,v 1.10 1999/12/18 04:01:14 zeev Exp $ */ +/* $Id: image.c,v 1.11 1999/12/18 22:35:27 zeev Exp $ */ /* * Based on Daniel Schmitt's imageinfo.c which carried the following * Copyright notice. @@ -306,14 +306,14 @@ switch(ARG_COUNT(ht)){ case 1: - if (getParametersEx(1, &arg1) == FAILURE) { + if (zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(arg1); break; case 2: - if (getParametersEx(2, &arg1, &info) == FAILURE) { + if (zend_get_parameters_ex(2, &arg1, &info) == FAILURE) { WRONG_PARAM_COUNT; } if (!ParameterPassedByReference(ht, 2)) { Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.50 php4/ext/standard/info.c:1.51 --- php4/ext/standard/info.c:1.50 Fri Dec 17 23:01:14 1999 +++ php4/ext/standard/info.c Sat Dec 18 17:35:27 1999 @@ -452,7 +452,7 @@ flag = 0xFFFFFFFF; break; case 1: - if (getParametersEx(1, &flag_arg)==FAILURE) { + if (zend_get_parameters_ex(1, &flag_arg)==FAILURE) { RETURN_FALSE; } convert_to_long_ex(flag_arg); @@ -491,7 +491,7 @@ flag = 0xFFFFFFFF; break; case 1: - if (getParametersEx(1, &flag_arg)==FAILURE) { + if (zend_get_parameters_ex(1, &flag_arg)==FAILURE) { RETURN_FALSE; } convert_to_long_ex(flag_arg); Index: php4/ext/standard/iptc.c diff -u php4/ext/standard/iptc.c:1.12 php4/ext/standard/iptc.c:1.13 --- php4/ext/standard/iptc.c:1.12 Fri Dec 17 23:01:14 1999 +++ php4/ext/standard/iptc.c Sat Dec 18 17:35:27 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: iptc.c,v 1.12 1999/12/18 04:01:14 zeev Exp $ */ +/* $Id: iptc.c,v 1.13 1999/12/18 22:35:27 zeev Exp $ */ /* * Functions to parse & compse IPTC data. @@ -173,7 +173,7 @@ switch(ARG_COUNT(ht)){ case 3: - if (getParametersEx(3, &iptcdata, &jpeg_file, &spool_flag) == FAILURE) { + if (zend_get_parameters_ex(3, &iptcdata, &jpeg_file, &spool_flag) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(iptcdata); @@ -183,7 +183,7 @@ break; case 2: - if (getParametersEx(2, &iptcdata, &jpeg_file) == FAILURE) { + if (zend_get_parameters_ex(2, &iptcdata, &jpeg_file) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(iptcdata); @@ -303,7 +303,7 @@ unsigned char key[ 16 ]; zval *values, **str, **element; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(str); Index: php4/ext/standard/link.c diff -u php4/ext/standard/link.c:1.14 php4/ext/standard/link.c:1.15 --- php4/ext/standard/link.c:1.14 Fri Dec 17 14:16:47 1999 +++ php4/ext/standard/link.c Sat Dec 18 17:35:27 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: link.c,v 1.14 1999/12/17 19:16:47 zeev Exp $ */ +/* $Id: link.c,v 1.15 1999/12/18 22:35:27 zeev Exp $ */ #include "php.h" #include "php_filestat.h" @@ -57,7 +57,7 @@ char buff[256]; int ret; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &filename) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(filename); @@ -83,7 +83,7 @@ struct stat sb; int ret; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &filename) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(filename); @@ -107,7 +107,7 @@ int ret; PLS_FETCH(); - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &topath, &frompath) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &topath, &frompath) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(topath); @@ -140,7 +140,7 @@ int ret; PLS_FETCH(); - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &topath, &frompath) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &topath, &frompath) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(topath); @@ -172,7 +172,7 @@ int ret; PLS_FETCH(); - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &filename) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(filename); Index: php4/ext/standard/mail.c diff -u php4/ext/standard/mail.c:1.13 php4/ext/standard/mail.c:1.14 --- php4/ext/standard/mail.c:1.13 Fri Dec 17 23:01:14 1999 +++ php4/ext/standard/mail.c Sat Dec 18 17:35:27 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mail.c,v 1.13 1999/12/18 04:01:14 zeev Exp $ */ +/* $Id: mail.c,v 1.14 1999/12/18 22:35:27 zeev Exp $ */ #include <stdlib.h> #include <ctype.h> @@ -62,7 +62,7 @@ int argc; argc = ARG_COUNT(ht); - if (argc < 3 || argc > 4 || getParametersArrayEx(argc, argv) == FAILURE) { + if (argc < 3 || argc > 4 || zend_get_parameters_array_ex(argc, argv) == FAILURE) { WRONG_PARAM_COUNT; } /* To: */ Index: php4/ext/standard/math.c diff -u php4/ext/standard/math.c:1.11 php4/ext/standard/math.c:1.12 --- php4/ext/standard/math.c:1.11 Sun Nov 21 21:38:00 1999 +++ php4/ext/standard/math.c Sat Dec 18 17:35:27 1999 @@ -39,7 +39,7 @@ { zval **value; - if (ARG_COUNT(ht)!=1||getParametersEx(1,&value)==FAILURE) { + if (ARG_COUNT(ht)!=1||zend_get_parameters_ex(1,&value)==FAILURE) { WRONG_PARAM_COUNT; } @@ -62,7 +62,7 @@ { zval **value; - if (ARG_COUNT(ht)!=1||getParametersEx(1,&value)==FAILURE) { + if (ARG_COUNT(ht)!=1||zend_get_parameters_ex(1,&value)==FAILURE) { WRONG_PARAM_COUNT; } @@ -84,7 +84,7 @@ PHP_FUNCTION(floor) { zval **value; - if (ARG_COUNT(ht)!=1||getParametersEx(1,&value)==FAILURE) { + if (ARG_COUNT(ht)!=1||zend_get_parameters_ex(1,&value)==FAILURE) { WRONG_PARAM_COUNT; } @@ -121,7 +121,7 @@ { zval **value; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &value) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &value) == FAILURE) { WRONG_PARAM_COUNT; } @@ -143,7 +143,7 @@ { zval **num; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_double_ex(num); @@ -159,7 +159,7 @@ { zval **num; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_double_ex(num); @@ -173,7 +173,7 @@ { zval **num; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_double_ex(num); @@ -189,7 +189,7 @@ { zval **num; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_double_ex(num); @@ -205,7 +205,7 @@ { zval **num; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_double_ex(num); @@ -221,7 +221,7 @@ { zval **num; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_double_ex(num); @@ -237,7 +237,7 @@ { zval **num1, **num2; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &num1, &num2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &num1, &num2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_double_ex(num1); @@ -264,7 +264,7 @@ { zval **num1, **num2; - if (ARG_COUNT(ht) != 2 || getParametersEx(2,&num1,&num2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2,&num1,&num2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_double_ex(num1); @@ -280,7 +280,7 @@ { zval **num; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_double_ex(num); @@ -296,7 +296,7 @@ { zval **num; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_double_ex(num); @@ -312,7 +312,7 @@ { zval **num; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_double_ex(num); @@ -328,7 +328,7 @@ { zval **num; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_double_ex(num); @@ -344,7 +344,7 @@ { zval **deg; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &deg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &deg) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_double_ex(deg); @@ -359,7 +359,7 @@ { zval **rad; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &rad) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &rad) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_double_ex(rad); @@ -452,7 +452,7 @@ zval **arg; long ret; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } @@ -471,7 +471,7 @@ zval **arg; long ret; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } @@ -490,7 +490,7 @@ zval **arg; long ret; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } @@ -509,7 +509,7 @@ zval **arg; char *result; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } @@ -530,7 +530,7 @@ zval **arg; char *result; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } @@ -551,7 +551,7 @@ zval **arg; char *result; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } @@ -573,7 +573,7 @@ zval **number, **frombase, **tobase, temp; char *result; - if (ARG_COUNT(ht) != 3 || getParametersEx(3, &number, &frombase, &tobase) == FAILURE) { + if (ARG_COUNT(ht) != 3 || zend_get_parameters_ex(3, &number, &frombase, &tobase) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(number); @@ -667,14 +667,14 @@ switch(ARG_COUNT(ht)) { case 1: - if (getParametersEx(1, &num)==FAILURE) { + if (zend_get_parameters_ex(1, &num)==FAILURE) { RETURN_FALSE; } convert_to_double_ex(num); RETURN_STRING(_php_math_number_format((*num)->value.dval,0,dec_point,thousand_sep),0); break; case 2: - if (getParametersEx(2, &num, &dec)==FAILURE) { + if (zend_get_parameters_ex(2, &num, &dec)==FAILURE) { RETURN_FALSE; } convert_to_double_ex(num); @@ -682,7 +682,7 @@ RETURN_STRING(_php_math_number_format((*num)->value.dval,(*dec)->value.lval,dec_point,thousand_sep),0); break; case 4: - if (getParametersEx(4, &num, &dec, &d_p, &t_s)==FAILURE) { + if (zend_get_parameters_ex(4, &num, &dec, &d_p, &t_s)==FAILURE) { RETURN_FALSE; } convert_to_double_ex(num); Index: php4/ext/standard/md5.c diff -u php4/ext/standard/md5.c:1.7 php4/ext/standard/md5.c:1.8 --- php4/ext/standard/md5.c:1.7 Fri Dec 17 15:51:01 1999 +++ php4/ext/standard/md5.c Sat Dec 18 17:35:28 1999 @@ -36,7 +36,7 @@ int i; char *r; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(arg); Index: php4/ext/standard/metaphone.c diff -u php4/ext/standard/metaphone.c:1.2 php4/ext/standard/metaphone.c:1.3 --- php4/ext/standard/metaphone.c:1.2 Mon Dec 13 22:49:42 1999 +++ php4/ext/standard/metaphone.c Sat Dec 18 17:35:28 1999 @@ -51,10 +51,10 @@ char *result = 0; int phones = 0; - if (getParametersEx(2, &pstr, &pphones) == SUCCESS) { + if (zend_get_parameters_ex(2, &pstr, &pphones) == SUCCESS) { convert_to_long_ex(pphones); phones = (*pphones)->value.lval; - } else if (getParametersEx(1, &pstr) == FAILURE) { + } else if (zend_get_parameters_ex(1, &pstr) == FAILURE) { WRONG_PARAM_COUNT; } Index: php4/ext/standard/microtime.c diff -u php4/ext/standard/microtime.c:1.10 php4/ext/standard/microtime.c:1.11 --- php4/ext/standard/microtime.c:1.10 Fri Sep 24 15:35:25 1999 +++ php4/ext/standard/microtime.c Sat Dec 18 17:35:28 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: microtime.c,v 1.10 1999/09/24 19:35:25 sas Exp $ */ +/* $Id: microtime.c,v 1.11 1999/12/18 22:35:28 zeev Exp $ */ #include <stdlib.h> #ifdef HAVE_UNISTD_H @@ -97,7 +97,7 @@ int who = RUSAGE_SELF; if(ac == 1 && - getParametersEx(ac, &pwho) != FAILURE) { + zend_get_parameters_ex(ac, &pwho) != FAILURE) { convert_to_long_ex(pwho); if((*pwho)->value.lval == 1) who = RUSAGE_CHILDREN; Index: php4/ext/standard/rand.c diff -u php4/ext/standard/rand.c:1.9 php4/ext/standard/rand.c:1.10 --- php4/ext/standard/rand.c:1.9 Fri Dec 17 23:01:15 1999 +++ php4/ext/standard/rand.c Sat Dec 18 17:35:28 1999 @@ -19,7 +19,7 @@ | Based on code from: Shawn Cokus <Cokus@math.washington.edu> | +----------------------------------------------------------------------+ */ -/* $Id: rand.c,v 1.9 1999/12/18 04:01:15 zeev Exp $ */ +/* $Id: rand.c,v 1.10 1999/12/18 22:35:28 zeev Exp $ */ #include <stdlib.h> @@ -193,7 +193,7 @@ { pval **arg; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg); @@ -216,7 +216,7 @@ pval **arg; BLS_FETCH(); - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg); @@ -234,7 +234,7 @@ case 0: break; case 2: - if (getParametersEx(2, &p_min, &p_max)==FAILURE) { + if (zend_get_parameters_ex(2, &p_min, &p_max)==FAILURE) { RETURN_FALSE; } convert_to_long_ex(p_min); @@ -300,7 +300,7 @@ case 0: break; case 2: - if (getParametersEx(2, &p_min, &p_max)==FAILURE) { + if (zend_get_parameters_ex(2, &p_min, &p_max)==FAILURE) { RETURN_FALSE; } convert_to_long_ex(p_min); Index: php4/ext/standard/reg.c diff -u php4/ext/standard/reg.c:1.27 php4/ext/standard/reg.c:1.28 --- php4/ext/standard/reg.c:1.27 Fri Dec 17 23:01:15 1999 +++ php4/ext/standard/reg.c Sat Dec 18 17:35:28 1999 @@ -17,7 +17,7 @@ | Jaakko Hyvätti <jaakko@hyvatti.iki.fi> | +----------------------------------------------------------------------+ */ -/* $Id: reg.c,v 1.27 1999/12/18 04:01:15 zeev Exp $ */ +/* $Id: reg.c,v 1.28 1999/12/18 22:35:28 zeev Exp $ */ #include <stdio.h> #include "php.h" @@ -193,7 +193,7 @@ switch(ARG_COUNT(ht)) { case 2: - if (getParametersEx(2, &regex, &findin) == FAILURE) { + if (zend_get_parameters_ex(2, &regex, &findin) == FAILURE) { WRONG_PARAM_COUNT; } /* don't bother doing substring matching if we're not going @@ -201,7 +201,7 @@ copts |= REG_NOSUB; break; case 3: - if (getParametersEx(3, &regex, &findin, &array) == FAILURE) { + if (zend_get_parameters_ex(3, &regex, &findin, &array) == FAILURE) { WRONG_PARAM_COUNT; } if (!ParameterPassedByReference(ht, 3)) { @@ -445,7 +445,7 @@ char *replace; char *ret; - if (ARG_COUNT(ht) != 3 || getParametersEx(3, &arg_pattern, &arg_replace, &arg_string) == FAILURE) { + if (ARG_COUNT(ht) != 3 || zend_get_parameters_ex(3, &arg_pattern, &arg_replace, &arg_string) == FAILURE) { WRONG_PARAM_COUNT; } @@ -522,12 +522,12 @@ switch (ARG_COUNT(ht)) { case 2: - if (getParametersEx(2, &spliton, &str) == FAILURE) + if (zend_get_parameters_ex(2, &spliton, &str) == FAILURE) WRONG_PARAM_COUNT; count = -1; break; case 3: - if (getParametersEx(3, &spliton, &str, &arg_count) == FAILURE) + if (zend_get_parameters_ex(3, &spliton, &str, &arg_count) == FAILURE) WRONG_PARAM_COUNT; convert_to_long_ex(arg_count); count = (*arg_count)->value.lval; @@ -616,7 +616,7 @@ unsigned char c; register int i, j; - if (ARG_COUNT(ht)!=1 || getParametersEx(1, &string)==FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &string)==FAILURE) { WRONG_PARAM_COUNT; } Index: php4/ext/standard/soundex.c diff -u php4/ext/standard/soundex.c:1.8 php4/ext/standard/soundex.c:1.9 --- php4/ext/standard/soundex.c:1.8 Sat Dec 4 14:16:06 1999 +++ php4/ext/standard/soundex.c Sat Dec 18 17:35:28 1999 @@ -15,7 +15,7 @@ | Author: Bjørn Borud - Guardian Networks AS <borud@guardian.no> | +----------------------------------------------------------------------+ */ -/* $Id: soundex.c,v 1.8 1999/12/04 19:16:06 sas Exp $ */ +/* $Id: soundex.c,v 1.9 1999/12/18 22:35:28 zeev Exp $ */ #include "php.h" #include <stdlib.h> @@ -61,7 +61,7 @@ 0, /* Y */ '2'}; /* Z */ - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &parg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &parg) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(parg); Index: php4/ext/standard/string.c diff -u php4/ext/standard/string.c:1.75 php4/ext/standard/string.c:1.76 --- php4/ext/standard/string.c:1.75 Fri Dec 17 23:01:15 1999 +++ php4/ext/standard/string.c Sat Dec 18 17:35:28 1999 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.75 1999/12/18 04:01:15 zeev Exp $ */ +/* $Id: string.c,v 1.76 1999/12/18 22:35:28 zeev Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -66,7 +66,7 @@ char *new; size_t newlen; - if(ARG_COUNT(ht) != 1 || getParametersEx(1, &data) == FAILURE) { + if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &data) == FAILURE) { WRONG_PARAM_COUNT; } @@ -88,7 +88,7 @@ { zval **s1,**s2; - if (ARG_COUNT(ht)!=2 || getParametersEx(2, &s1, &s2) == FAILURE) { + if (ARG_COUNT(ht)!=2 || zend_get_parameters_ex(2, &s1, &s2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(s1); @@ -105,7 +105,7 @@ { zval **s1,**s2; - if (ARG_COUNT(ht)!=2 || getParametersEx(2, &s1, &s2) == FAILURE) { + if (ARG_COUNT(ht)!=2 || zend_get_parameters_ex(2, &s1, &s2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(s1); @@ -162,7 +162,7 @@ { pval **str; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(str); @@ -181,7 +181,7 @@ { pval **str; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(str); @@ -200,7 +200,7 @@ { pval **str; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(str); @@ -242,7 +242,7 @@ { pval **str, **delim; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &delim, &str) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &delim, &str) == FAILURE) { WRONG_PARAM_COUNT; } @@ -311,7 +311,7 @@ { pval **arg1, **arg2, *delim, *arr; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } @@ -346,8 +346,8 @@ argc = ARG_COUNT(ht); - if ((argc == 1 && getParametersEx(1, &tok) == FAILURE) || - (argc == 2 && getParametersEx(2, &str, &tok) == FAILURE) || + if ((argc == 1 && zend_get_parameters_ex(1, &tok) == FAILURE) || + (argc == 2 && zend_get_parameters_ex(2, &str, &tok) == FAILURE) || argc < 1 || argc > 2) { WRONG_PARAM_COUNT; } @@ -412,7 +412,7 @@ { pval **arg; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg)) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg)) { WRONG_PARAM_COUNT; } convert_to_string_ex(arg); @@ -445,7 +445,7 @@ pval **str; char *ret; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str)) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str)) { WRONG_PARAM_COUNT; } convert_to_string_ex(str); @@ -463,7 +463,7 @@ pval **str; char *ret, *c; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str)) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str)) { WRONG_PARAM_COUNT; } convert_to_string_ex(str); @@ -515,7 +515,7 @@ pval **str; char *ret; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str)) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str)) { WRONG_PARAM_COUNT; } convert_to_string_ex(str); @@ -574,7 +574,7 @@ char *found = NULL; char needle_char[2]; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &haystack, &needle) == + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &haystack, &needle) == FAILURE) { WRONG_PARAM_COUNT; } @@ -612,7 +612,7 @@ char *found = NULL; char needle_char[2]; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &haystack, &needle) == + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &haystack, &needle) == FAILURE) { WRONG_PARAM_COUNT; } @@ -658,12 +658,12 @@ switch(ARG_COUNT(ht)) { case 2: - if (getParametersEx(2, &haystack, &needle) == FAILURE) { + if (zend_get_parameters_ex(2, &haystack, &needle) == FAILURE) { WRONG_PARAM_COUNT; } break; case 3: - if (getParametersEx(3, &haystack, &needle, &OFFSET) == FAILURE) { + if (zend_get_parameters_ex(3, &haystack, &needle, &OFFSET) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(OFFSET); @@ -720,7 +720,7 @@ pval **haystack, **needle; char *found = NULL; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &haystack, &needle) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &haystack, &needle) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(haystack); @@ -747,7 +747,7 @@ pval **haystack, **needle; char *found = NULL; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &haystack, &needle) == + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &haystack, &needle) == FAILURE) { WRONG_PARAM_COUNT; } @@ -821,7 +821,7 @@ argc = ARG_COUNT(ht); if (argc < 1 || argc > 3 || - getParametersEx(argc, &p_str, &p_chunklen, &p_ending) == FAILURE) { + zend_get_parameters_ex(argc, &p_str, &p_chunklen, &p_ending) == FAILURE) { WRONG_PARAM_COUNT; } @@ -863,8 +863,8 @@ argc = ARG_COUNT(ht); - if ((argc == 2 && getParametersEx(2, &string, &from) == FAILURE) || - (argc == 3 && getParametersEx(3, &string, &from, &len) == FAILURE) || + if ((argc == 2 && zend_get_parameters_ex(2, &string, &from) == FAILURE) || + (argc == 3 && zend_get_parameters_ex(3, &string, &from, &len) == FAILURE) || argc < 2 || argc > 3) { WRONG_PARAM_COUNT; } @@ -928,8 +928,8 @@ argc = ARG_COUNT(ht); - if ((argc == 3 && getParametersEx(3, &string, &repl, &from) == FAILURE) || - (argc == 4 && getParametersEx(4, &string, &repl, &from, &len) == FAILURE) || + if ((argc == 3 && zend_get_parameters_ex(3, &string, &repl, &from) == FAILURE) || + (argc == 4 && zend_get_parameters_ex(4, &string, &repl, &from, &len) == FAILURE) || argc < 3 || argc > 4) { WRONG_PARAM_COUNT; } @@ -996,7 +996,7 @@ char *p, *q; char c; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(arg); @@ -1039,7 +1039,7 @@ { pval **str; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(str); @@ -1054,7 +1054,7 @@ pval **num; char temp[2]; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(num); @@ -1070,7 +1070,7 @@ { pval **arg; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(arg); @@ -1093,7 +1093,7 @@ char *r; char *r_end; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(str); @@ -1248,7 +1248,7 @@ pval **str, **from, **to; int ac = ARG_COUNT(ht); - if (ac < 2 || ac > 3 || getParametersEx(ac, &str, &from, &to) == FAILURE) { + if (ac < 2 || ac > 3 || zend_get_parameters_ex(ac, &str, &from, &to) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1286,7 +1286,7 @@ int i,len; char c; - if (ARG_COUNT(ht)!=1 || getParametersEx(1, &str)==FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &str)==FAILURE) { WRONG_PARAM_COUNT; } @@ -1353,7 +1353,7 @@ int sim; if (ac < 2 || ac > 3 || - getParametersEx(ac, &t1, &t2, &percent) == FAILURE) { + zend_get_parameters_ex(ac, &t1, &t2, &percent) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1439,7 +1439,7 @@ { pval **str, **what; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &str, &what) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &str, &what) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(str); @@ -1455,7 +1455,7 @@ { pval **str; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(str); @@ -1470,7 +1470,7 @@ { pval **str; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(str); @@ -1487,7 +1487,7 @@ { pval **str; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(str); @@ -1790,7 +1790,7 @@ int len = 0; if(ARG_COUNT(ht) != 3 || - getParametersEx(3, &needle, &str, &haystack) == FAILURE) { + zend_get_parameters_ex(3, &needle, &str, &haystack) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1839,12 +1839,12 @@ switch(ARG_COUNT(ht)) { case 1: - if (getParametersEx(1, &str)==FAILURE) { + if (zend_get_parameters_ex(1, &str)==FAILURE) { RETURN_FALSE; } break; case 2: - if (getParametersEx(2, &str, &max_chars_per_line)==FAILURE) { + if (zend_get_parameters_ex(2, &str, &max_chars_per_line)==FAILURE) { RETURN_FALSE; } convert_to_long_ex(max_chars_per_line); @@ -2013,7 +2013,7 @@ { pval **str; - if (ARG_COUNT(ht)!=1 || getParametersEx(1, &str)==FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &str)==FAILURE) { WRONG_PARAM_COUNT; } @@ -2032,12 +2032,12 @@ switch(ARG_COUNT(ht)) { case 1: - if(getParametersEx(1, &str)==FAILURE) { + if(zend_get_parameters_ex(1, &str)==FAILURE) { RETURN_FALSE; } break; case 2: - if(getParametersEx(2, &str, &allow)==FAILURE) { + if(zend_get_parameters_ex(2, &str, &allow)==FAILURE) { RETURN_FALSE; } convert_to_string_ex(allow); @@ -2063,7 +2063,7 @@ char *loc, *retval; BLS_FETCH(); - if (ARG_COUNT(ht)!=2 || getParametersEx(2, &pcategory, &plocale)==FAILURE) + if (ARG_COUNT(ht)!=2 || zend_get_parameters_ex(2, &pcategory, &plocale)==FAILURE) WRONG_PARAM_COUNT; #ifdef HAVE_SETLOCALE convert_to_string_ex(pcategory); @@ -2116,7 +2116,7 @@ PLS_FETCH(); SLS_FETCH(); - if (getParametersEx(1, &arg) == FAILURE) { + if (zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(arg); @@ -2318,7 +2318,7 @@ int result_len; /* Length of the resulting string */ int i; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &input_str, &mult) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &input_str, &mult) == FAILURE) { WRONG_PARAM_COUNT; } @@ -2365,7 +2365,7 @@ char retstr[256]; int retlen=0; - if (ac < 1 || ac > 2 || getParametersEx(ac, &input, &mode) == FAILURE) { + if (ac < 1 || ac > 2 || zend_get_parameters_ex(ac, &input, &mode) == FAILURE) { WRONG_PARAM_COUNT; } Index: php4/ext/standard/syslog.c diff -u php4/ext/standard/syslog.c:1.10 php4/ext/standard/syslog.c:1.11 --- php4/ext/standard/syslog.c:1.10 Fri Dec 17 15:55:24 1999 +++ php4/ext/standard/syslog.c Sat Dec 18 17:35:28 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: syslog.c,v 1.10 1999/12/17 20:55:24 zeev Exp $ */ +/* $Id: syslog.c,v 1.11 1999/12/18 22:35:28 zeev Exp $ */ #include "php.h" #include "php_ini.h" @@ -205,7 +205,7 @@ PHP_FUNCTION(openlog) { pval **ident, **option, **facility; - if (ARG_COUNT(ht) != 3 || getParametersEx(3, &ident, &option, &facility) == FAILURE) { + if (ARG_COUNT(ht) != 3 || zend_get_parameters_ex(3, &ident, &option, &facility) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(ident); @@ -239,7 +239,7 @@ { pval **priority, **message; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &priority, &message) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &priority, &message) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(priority); Index: php4/ext/standard/uniqid.c diff -u php4/ext/standard/uniqid.c:1.13 php4/ext/standard/uniqid.c:1.14 --- php4/ext/standard/uniqid.c:1.13 Fri Sep 24 15:35:25 1999 +++ php4/ext/standard/uniqid.c Sat Dec 18 17:35:28 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: uniqid.c,v 1.13 1999/09/24 19:35:25 sas Exp $ */ +/* $Id: uniqid.c,v 1.14 1999/12/18 22:35:28 zeev Exp $ */ #include "php.h" @@ -51,7 +51,7 @@ struct timeval tv; argc = ARG_COUNT(ht); - if (argc < 1 || argc > 2 || getParametersEx(argc, &prefix, &flags)) { + if (argc < 1 || argc > 2 || zend_get_parameters_ex(argc, &prefix, &flags)) { WRONG_PARAM_COUNT; } convert_to_string_ex(prefix); Index: php4/ext/standard/url.c diff -u php4/ext/standard/url.c:1.16 php4/ext/standard/url.c:1.17 --- php4/ext/standard/url.c:1.16 Fri Dec 17 23:01:15 1999 +++ php4/ext/standard/url.c Sat Dec 18 17:35:28 1999 @@ -15,7 +15,7 @@ | Author: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: url.c,v 1.16 1999/12/18 04:01:15 zeev Exp $ */ +/* $Id: url.c,v 1.17 1999/12/18 22:35:28 zeev Exp $ */ #include <stdlib.h> #include <string.h> @@ -158,7 +158,7 @@ pval **string; url *resource; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &string) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &string) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(string); @@ -266,7 +266,7 @@ pval **arg; char *str; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(arg); @@ -288,7 +288,7 @@ pval **arg; int len; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(arg); @@ -366,7 +366,7 @@ pval **arg; char *str; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(arg); @@ -387,7 +387,7 @@ pval **arg; int len; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(arg); Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.38 php4/ext/standard/var.c:1.39 --- php4/ext/standard/var.c:1.38 Fri Dec 17 23:01:15 1999 +++ php4/ext/standard/var.c Sat Dec 18 17:35:28 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.38 1999/12/18 04:01:15 zeev Exp $ */ +/* $Id: var.c,v 1.39 1999/12/18 22:35:28 zeev Exp $ */ /* {{{ includes @@ -151,7 +151,7 @@ argc = ARG_COUNT(ht); args = (zval ***)emalloc(argc * sizeof(zval **)); - if (ARG_COUNT(ht) == 0 || getParametersArrayEx(argc, args) == FAILURE) { + if (ARG_COUNT(ht) == 0 || zend_get_parameters_array_ex(argc, args) == FAILURE) { efree(args); WRONG_PARAM_COUNT; } @@ -472,7 +472,7 @@ { pval **struc; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &struc) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &struc) == FAILURE) { WRONG_PARAM_COUNT; } return_value->type = IS_STRING; @@ -490,7 +490,7 @@ { pval **buf; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &buf) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &buf) == FAILURE) { WRONG_PARAM_COUNT; } Index: php4/ext/sysvsem/sysvsem.c diff -u php4/ext/sysvsem/sysvsem.c:1.13 php4/ext/sysvsem/sysvsem.c:1.14 --- php4/ext/sysvsem/sysvsem.c:1.13 Fri Dec 17 23:01:17 1999 +++ php4/ext/sysvsem/sysvsem.c Sat Dec 18 17:35:29 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvsem.c,v 1.13 1999/12/18 04:01:17 zeev Exp $ */ +/* $Id: sysvsem.c,v 1.14 1999/12/18 22:35:29 zeev Exp $ */ /* This has been built and tested on Solaris 2.6 and Linux 2.1.122. * It may not compile or execute correctly on other systems. @@ -146,14 +146,14 @@ switch (ARG_COUNT(ht)) { case 1: - if (getParametersEx(1, &arg_key)==FAILURE) { + if (zend_get_parameters_ex(1, &arg_key)==FAILURE) { RETURN_FALSE; } convert_to_long_ex(arg_key); key = (int)(*arg_key)->value.lval; break; case 2: - if (getParametersEx(2, &arg_key, &arg_max_acquire)==FAILURE) { + if (zend_get_parameters_ex(2, &arg_key, &arg_max_acquire)==FAILURE) { RETURN_FALSE; } convert_to_long_ex(arg_key); @@ -162,7 +162,7 @@ max_acquire = (int)(*arg_max_acquire)->value.lval; break; case 3: - if (getParametersEx(3, &arg_key, &arg_max_acquire, &arg_perm)==FAILURE) { + if (zend_get_parameters_ex(3, &arg_key, &arg_max_acquire, &arg_perm)==FAILURE) { RETURN_FALSE; } convert_to_long_ex(arg_key); @@ -289,7 +289,7 @@ switch(ARG_COUNT(ht)) { case 1: - if (getParametersEx(1, &arg_id)==FAILURE) { + if (zend_get_parameters_ex(1, &arg_id)==FAILURE) { RETURN_FALSE; } convert_to_long_ex(arg_id); Index: php4/ext/sysvshm/sysvshm.c diff -u php4/ext/sysvshm/sysvshm.c:1.14 php4/ext/sysvshm/sysvshm.c:1.15 --- php4/ext/sysvshm/sysvshm.c:1.14 Fri Dec 17 23:01:18 1999 +++ php4/ext/sysvshm/sysvshm.c Sat Dec 18 17:35:30 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvshm.c,v 1.14 1999/12/18 04:01:18 zeev Exp $ */ +/* $Id: sysvshm.c,v 1.15 1999/12/18 22:35:30 zeev Exp $ */ /* This has been built and tested on Solaris 2.6. * It may not compile or execute correctly on other systems. @@ -90,7 +90,7 @@ shm_flag = 0666; shm_size = php_sysvshm.init_mem; - if(ac < 1 || ac > 3 || getParametersEx(ac, &arg_key, &arg_size, &arg_flag) == FAILURE) { + if(ac < 1 || ac > 3 || zend_get_parameters_ex(ac, &arg_key, &arg_size, &arg_flag) == FAILURE) { WRONG_PARAM_COUNT; } @@ -156,7 +156,7 @@ pval **arg_id; long id; - if(ARG_COUNT(ht) != 1 || getParametersEx(1, &arg_id) == FAILURE) { + if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg_id) == FAILURE) { WRONG_PARAM_COUNT; } @@ -177,7 +177,7 @@ long id; key_t key; - if(ARG_COUNT(ht) != 1 || getParametersEx(1, &arg_key) == FAILURE) { + if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg_key) == FAILURE) { WRONG_PARAM_COUNT; } @@ -211,7 +211,7 @@ pval shm_var; int ret; - if(ARG_COUNT(ht) != 3 || getParametersEx(3, &arg_id, &arg_key,&arg_var) == FAILURE) { + if(ARG_COUNT(ht) != 3 || zend_get_parameters_ex(3, &arg_id, &arg_key,&arg_var) == FAILURE) { WRONG_PARAM_COUNT; } @@ -261,7 +261,7 @@ long shm_varpos; sysvshm_chunk *shm_var; - if(ARG_COUNT(ht) != 2 || getParametersEx(2, &arg_id, &arg_key) == FAILURE) { + if(ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg_id, &arg_key) == FAILURE) { WRONG_PARAM_COUNT; } @@ -304,7 +304,7 @@ int type; long shm_varpos; - if(ARG_COUNT(ht) != 2 || getParametersEx(2, &arg_id, &arg_key) == FAILURE) { + if(ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg_id, &arg_key) == FAILURE) { WRONG_PARAM_COUNT; } Index: php4/ext/wddx/wddx.c diff -u php4/ext/wddx/wddx.c:1.16 php4/ext/wddx/wddx.c:1.17 --- php4/ext/wddx/wddx.c:1.16 Tue Oct 12 11:23:59 1999 +++ php4/ext/wddx/wddx.c Sat Dec 18 17:35:31 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: wddx.c,v 1.16 1999/10/12 15:23:59 thies Exp $ */ +/* $Id: wddx.c,v 1.17 1999/12/18 22:35:31 zeev Exp $ */ #include "php.h" #include "php_wddx.h" @@ -687,7 +687,7 @@ char *buf; argc = ARG_COUNT(ht); - if(argc < 1 || argc > 2 || getParametersEx(argc, &var, &comment) == FAILURE) { + if(argc < 1 || argc > 2 || zend_get_parameters_ex(argc, &var, &comment) == FAILURE) { WRONG_PARAM_COUNT; } @@ -726,7 +726,7 @@ argc = ARG_COUNT(ht); /* Allocate arguments array and get the arguments, checking for errors. */ args = (zval ***)emalloc(argc * sizeof(zval **)); - if (getParametersArrayEx(argc, args) == FAILURE) { + if (zend_get_parameters_array_ex(argc, args) == FAILURE) { efree(args); WRONG_PARAM_COUNT; } @@ -780,7 +780,7 @@ comment = NULL; argc = ARG_COUNT(ht); - if (argc > 1 || (argc == 1 && getParametersEx(1, &comment)==FAILURE)) { + if (argc > 1 || (argc == 1 && zend_get_parameters_ex(1, &comment)==FAILURE)) { WRONG_PARAM_COUNT; } @@ -811,7 +811,7 @@ char *buf; wddx_packet *packet = NULL; - if (ARG_COUNT(ht)!=1 || getParametersEx(1, &packet_id)==FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &packet_id)==FAILURE) { WRONG_PARAM_COUNT; } @@ -846,7 +846,7 @@ /* Allocate arguments array and get the arguments, checking for errors. */ args = (zval ***)emalloc(argc * sizeof(zval **)); - if (getParametersArrayEx(argc, args) == FAILURE) { + if (zend_get_parameters_array_ex(argc, args) == FAILURE) { efree(args); WRONG_PARAM_COUNT; } @@ -878,7 +878,7 @@ { zval **packet; - if (ARG_COUNT(ht)!=1 || getParametersEx(1, &packet) == FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &packet) == FAILURE) { WRONG_PARAM_COUNT; } Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.39 php4/ext/xml/xml.c:1.40 --- php4/ext/xml/xml.c:1.39 Fri Dec 17 22:20:52 1999 +++ php4/ext/xml/xml.c Sat Dec 18 17:35:33 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.39 1999/12/18 03:20:52 zeev Exp $ */ +/* $Id: xml.c,v 1.40 1999/12/18 22:35:33 zeev Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -989,7 +989,7 @@ argc = ARG_COUNT(ht); - if (argc > 1 || getParametersEx(argc, &encodingArg) == FAILURE) { + if (argc > 1 || zend_get_parameters_ex(argc, &encodingArg) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1036,7 +1036,7 @@ zval **pind, **mythis; if (ARG_COUNT(ht) != 2 || - getParametersEx(2, &pind, &mythis) == FAILURE) { + zend_get_parameters_ex(2, &pind, &mythis) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1075,7 +1075,7 @@ zval **pind, **shdl, **ehdl; if (ARG_COUNT(ht) != 3 || - getParametersEx(3, &pind, &shdl, &ehdl) == FAILURE) { + zend_get_parameters_ex(3, &pind, &shdl, &ehdl) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1095,7 +1095,7 @@ xml_parser *parser; zval **pind, **hdl; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &pind, &hdl) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &pind, &hdl) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1114,7 +1114,7 @@ xml_parser *parser; zval **pind, **hdl; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &pind, &hdl) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &pind, &hdl) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1133,7 +1133,7 @@ xml_parser *parser; zval **pind, **hdl; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &pind, &hdl) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &pind, &hdl) == FAILURE) { WRONG_PARAM_COUNT; } ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser); @@ -1151,7 +1151,7 @@ xml_parser *parser; zval **pind, **hdl; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &pind, &hdl) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &pind, &hdl) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1170,7 +1170,7 @@ xml_parser *parser; zval **pind, **hdl; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &pind, &hdl) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &pind, &hdl) == FAILURE) { WRONG_PARAM_COUNT; } ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser); @@ -1188,7 +1188,7 @@ xml_parser *parser; zval **pind, **hdl; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &pind, &hdl) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &pind, &hdl) == FAILURE) { WRONG_PARAM_COUNT; } ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser); @@ -1208,7 +1208,7 @@ int argc, isFinal, ret; argc = ARG_COUNT(ht); - if (argc < 2 || argc > 3 || getParametersEx(argc, &pind, &data, &final) == FAILURE) { + if (argc < 2 || argc > 3 || zend_get_parameters_ex(argc, &pind, &data, &final) == FAILURE) { WRONG_PARAM_COUNT; } ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser); @@ -1237,14 +1237,14 @@ int argc, ret; argc = ARG_COUNT(ht); - if (getParametersEx(4, &pind, &data, &xdata,&info) == SUCCESS) { + if (zend_get_parameters_ex(4, &pind, &data, &xdata,&info) == SUCCESS) { if (!ParameterPassedByReference(ht, 4)) { php_error(E_WARNING, "Array to be filled with values must be passed by reference."); RETURN_FALSE; } zval_dtor(*info); array_init(*info); - } else if (getParametersEx(3, &pind, &data, &xdata) == FAILURE) { + } else if (zend_get_parameters_ex(3, &pind, &data, &xdata) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1282,7 +1282,7 @@ xml_parser *parser; zval **pind; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &pind) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &pind) == FAILURE) { WRONG_PARAM_COUNT; } ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser); @@ -1298,7 +1298,7 @@ zval **code; char *str; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &code) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &code) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(code); @@ -1316,7 +1316,7 @@ xml_parser *parser; zval **pind; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &pind) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &pind) == FAILURE) { WRONG_PARAM_COUNT; } ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser); @@ -1333,7 +1333,7 @@ xml_parser *parser; zval **pind; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &pind) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &pind) == FAILURE) { WRONG_PARAM_COUNT; } ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser); @@ -1349,7 +1349,7 @@ xml_parser *parser; zval **pind; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &pind) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &pind) == FAILURE) { WRONG_PARAM_COUNT; } ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser); @@ -1365,7 +1365,7 @@ zval **pind; xml_parser *parser; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &pind) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &pind) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1387,7 +1387,7 @@ zval **pind, **opt, **val; char thisfunc[] = "xml_parser_set_option"; - if (ARG_COUNT(ht) != 3 || getParametersEx(3, &pind, &opt, &val) == FAILURE) { + if (ARG_COUNT(ht) != 3 || zend_get_parameters_ex(3, &pind, &opt, &val) == FAILURE) { WRONG_PARAM_COUNT; } ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser); @@ -1436,7 +1436,7 @@ zval **pind, **opt; char thisfunc[] = "xml_parser_get_option"; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &pind, &opt) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &pind, &opt) == FAILURE) { WRONG_PARAM_COUNT; } ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser); @@ -1467,7 +1467,7 @@ XML_Char *encoded; int len; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(arg); @@ -1487,7 +1487,7 @@ XML_Char *decoded; int len; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(arg); Index: php4/ext/yp/yp.c diff -u php4/ext/yp/yp.c:1.5 php4/ext/yp/yp.c:1.6 --- php4/ext/yp/yp.c:1.5 Tue Dec 14 22:51:24 1999 +++ php4/ext/yp/yp.c Sat Dec 18 17:35:34 1999 @@ -15,7 +15,7 @@ | Authors: Stephanie Wehner <_@r4k.net> | +----------------------------------------------------------------------+ */ -/* $Id: yp.c,v 1.5 1999/12/15 03:51:24 evan Exp $ */ +/* $Id: yp.c,v 1.6 1999/12/18 22:35:34 zeev Exp $ */ #include "php.h" @@ -69,7 +69,7 @@ int outval; #endif - if((ARG_COUNT(ht) != 2) || getParametersEx(2,&domain,&map) == FAILURE) { + if((ARG_COUNT(ht) != 2) || zend_get_parameters_ex(2,&domain,&map) == FAILURE) { WRONG_PARAM_COUNT; } @@ -90,7 +90,7 @@ pval **domain, **map; char *outname; - if((ARG_COUNT(ht) != 2) || getParametersEx(2,&domain,&map) == FAILURE) { + if((ARG_COUNT(ht) != 2) || zend_get_parameters_ex(2,&domain,&map) == FAILURE) { WRONG_PARAM_COUNT; } @@ -112,7 +112,7 @@ char *outval; int outvallen; - if((ARG_COUNT(ht) != 3) || getParametersEx(3,&domain,&map,&key) == FAILURE) { + if((ARG_COUNT(ht) != 3) || zend_get_parameters_ex(3,&domain,&map,&key) == FAILURE) { WRONG_PARAM_COUNT; } @@ -135,7 +135,7 @@ char *outval, *outkey; int outvallen, outkeylen; - if((ARG_COUNT(ht) != 2) || getParametersEx(2,&domain,&map) == FAILURE) { + if((ARG_COUNT(ht) != 2) || zend_get_parameters_ex(2,&domain,&map) == FAILURE) { WRONG_PARAM_COUNT; } @@ -158,7 +158,7 @@ char *outval, *outkey; int outvallen, outkeylen; - if((ARG_COUNT(ht) != 3) || getParametersEx(3,&domain,&map,&key) == FAILURE) { + if((ARG_COUNT(ht) != 3) || zend_get_parameters_ex(3,&domain,&map,&key) == FAILURE) { WRONG_PARAM_COUNT; } Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.28 php4/ext/zlib/zlib.c:1.29 --- php4/ext/zlib/zlib.c:1.28 Fri Dec 17 17:34:03 1999 +++ php4/ext/zlib/zlib.c Sat Dec 18 17:35:35 1999 @@ -16,7 +16,7 @@ | Stefan Röhrich <sr@linux.de> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.28 1999/12/17 22:34:03 zeev Exp $ */ +/* $Id: zlib.c,v 1.29 1999/12/18 22:35:35 zeev Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -287,12 +287,12 @@ /* check args */ switch (ARG_COUNT(ht)) { case 1: - if (getParametersEx(1,&filename) == FAILURE) { + if (zend_get_parameters_ex(1,&filename) == FAILURE) { WRONG_PARAM_COUNT; } break; case 2: - if (getParametersEx(2,&filename,&arg2) == FAILURE) { + if (zend_get_parameters_ex(2,&filename,&arg2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg2); @@ -341,12 +341,12 @@ switch(ARG_COUNT(ht)) { case 2: - if (getParametersEx(2,&arg1,&arg2) == FAILURE) { + if (zend_get_parameters_ex(2,&arg1,&arg2) == FAILURE) { WRONG_PARAM_COUNT; } break; case 3: - if (getParametersEx(3,&arg1,&arg2,&arg3) == FAILURE) { + if (zend_get_parameters_ex(3,&arg1,&arg2,&arg3) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg3); @@ -382,7 +382,7 @@ pval **arg1; gzFile *zp; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } ZEND_FETCH_RESOURCE(zp, gzFile *, arg1, -1, "Zlib file", le_zp); @@ -397,7 +397,7 @@ pval **arg1; gzFile *zp; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } ZEND_FETCH_RESOURCE(zp, gzFile *, arg1, -1, "Zlib file", le_zp); @@ -419,7 +419,7 @@ char *buf; PLS_FETCH(); - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg2); @@ -454,7 +454,7 @@ int c; char *buf; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } @@ -488,12 +488,12 @@ switch(ARG_COUNT(ht)) { case 2: - if(getParametersEx(2, &fd, &bytes) == FAILURE) { + if(zend_get_parameters_ex(2, &fd, &bytes) == FAILURE) { RETURN_FALSE; } break; case 3: - if(getParametersEx(3, &fd, &bytes, &allow) == FAILURE) { + if(zend_get_parameters_ex(3, &fd, &bytes, &allow) == FAILURE) { RETURN_FALSE; } convert_to_string_ex(allow); @@ -536,14 +536,14 @@ switch (ARG_COUNT(ht)) { case 2: - if (getParametersEx(2, &arg1, &arg2)==FAILURE) { + if (zend_get_parameters_ex(2, &arg1, &arg2)==FAILURE) { RETURN_FALSE; } convert_to_string_ex(arg2); num_bytes = (*arg2)->value.str.len; break; case 3: - if (getParametersEx(3, &arg1, &arg2, &arg3)==FAILURE) { + if (zend_get_parameters_ex(3, &arg1, &arg2, &arg3)==FAILURE) { RETURN_FALSE; } convert_to_string_ex(arg2); @@ -577,7 +577,7 @@ pval **arg1; gzFile *zp; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } @@ -595,7 +595,7 @@ long pos; gzFile *zp; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } @@ -613,7 +613,7 @@ int ret; gzFile *zp; - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg2); @@ -641,12 +641,12 @@ /* check args */ switch (ARG_COUNT(ht)) { case 1: - if (getParametersEx(1,&arg1) == FAILURE) { + if (zend_get_parameters_ex(1,&arg1) == FAILURE) { WRONG_PARAM_COUNT; } break; case 2: - if (getParametersEx(2,&arg1,&arg2) == FAILURE) { + if (zend_get_parameters_ex(2,&arg1,&arg2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg2); @@ -687,7 +687,7 @@ char buf[8192]; int size, b; - if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } @@ -713,7 +713,7 @@ int len; PLS_FETCH(); - if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg2);