- The tree compiles again

diff --git a/Zend/zend.h b/Zend/zend.h
index 34a01cf6c5cb91c5babbb8e0ffa105132affcff9..0ef98ee46aa2f67ee217e136866af60d8f2983b3 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -96,8 +96,8 @@ typedef unsigned char zend_bool;
 #include "zend_hash.h"
 #include "zend_llist.h"
 
-#define INTERNAL_FUNCTION_PARAMETERS int num_args, zval *return_value, HashTable *list, HashTable *plist, zval *this_ptr, int return_value_used
-#define INTERNAL_FUNCTION_PARAM_PASSTHRU num_args, return_value, list, plist, this_ptr, return_value_used
+#define INTERNAL_FUNCTION_PARAMETERS int ht, zval *return_value, HashTable *list, HashTable *plist, zval *this_ptr, int return_value_used
+#define INTERNAL_FUNCTION_PARAM_PASSTHRU ht, return_value, list, plist, this_ptr, return_value_used
 
 /*
  * zval

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index e76e970b67d88a777771898ba318ae3d2457357d..3c475d0b67aabe04b2d297df52767fa1a0402f61 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -75,8 +75,8 @@ ZEND_API void wrong_param_count(void);
 
 #define WRONG_PARAM_COUNT { wrong_param_count(); return; }
 #define WRONG_PARAM_COUNT_WITH_RETVAL(ret) { wrong_param_count(); return ret; }
-#define ARG_COUNT(dummy)       (num_args)
-#define ZEND_NUM_ARGS()                (num_args)
+#define ARG_COUNT(dummy)       (ht)
+#define ZEND_NUM_ARGS()                (ht)
 
 #define BYREF_NONE 0
 #define BYREF_FORCE 1

diff --git a/ext/apache/apache.c b/ext/apache/apache.c
index d29579aaed5d7ef948cf038217f2067a4570d690..f5d9c38c5e4401dbe631fa056f3e9cf9f53fea8c 100644 (file)
--- a/ext/apache/apache.c
+++ b/ext/apache/apache.c
@@ -127,7 +127,7 @@ PHP_FUNCTION(apache_note)
        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 @@ PHP_FUNCTION(virtual)
        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 @@ PHP_FUNCTION(apache_lookup_uri)
        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 @@ PHP_FUNCTION(apache_exec_uri)
        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);

diff --git a/ext/aspell/aspell.c b/ext/aspell/aspell.c
index 6e8912557808196c024bd125bedb1a50472424c6..d97cd6d04c8975ecc9a05c6e03f66337d1f67580 100644 (file)
--- a/ext/aspell/aspell.c
+++ b/ext/aspell/aspell.c
@@ -78,7 +78,7 @@ PHP_FUNCTION(aspell_new)
        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 @@ PHP_FUNCTION(aspell_suggest)
 
        
        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 @@ PHP_FUNCTION(aspell_check)
 
    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 @@ PHP_FUNCTION(aspell_check_raw)
   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);

diff --git a/ext/cybercash/cybercash.c b/ext/cybercash/cybercash.c
index 9c5784886a788b090c9f076ddeddb4338a9edd0f..bc49c5aa3a0b27cf24b74970b7e4b041743d8eee 100644 (file)
--- a/ext/cybercash/cybercash.c
+++ b/ext/cybercash/cybercash.c
@@ -59,7 +59,7 @@ PHP_FUNCTION(cybercash_encr)
        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 @@ PHP_FUNCTION(cybercash_decr)
   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 @@ PHP_FUNCTION(cybercash_base64_encode)
   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 @@ PHP_FUNCTION(cybercash_base64_decode)
   long ret_length;
 
   if(ARG_COUNT(ht) != 1 ||
-     getParametersEx(1,&inbuff) == FAILURE)
+     zend_get_parameters_ex(1,&inbuff) == FAILURE)
   {
     WRONG_PARAM_COUNT;
   }

diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index d448441e47ab17c16ea170bb7d534d144888f336..ef1ef2c5099b43324472e84bd6252dcbc10641cc 100644 (file)
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -95,13 +95,13 @@ typedef struct dba_handler {
 /* 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)
@@ -211,7 +211,7 @@ static void php_dba_update(INTERNAL_FUNCTION_PARAMETERS, int mode)
        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 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
        
        /* 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;
        }

diff --git a/ext/ereg/ereg.c b/ext/ereg/ereg.c
index 39107fa83b2ce188e0af1ad302c2ca96e168e5d3..5f5449a2f8973498c556b3ba662c37f1c91f17bf 100644 (file)
--- a/ext/ereg/ereg.c
+++ b/ext/ereg/ereg.c
@@ -193,7 +193,7 @@ static void php_ereg(INTERNAL_FUNCTION_PARAMETERS, int icase)
 
        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 @@ static void php_ereg(INTERNAL_FUNCTION_PARAMETERS, int icase)
                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 @@ static void php_ereg_replace(INTERNAL_FUNCTION_PARAMETERS, int icase)
        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 @@ PHP_FUNCTION(split)
        
        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 @@ PHPAPI PHP_FUNCTION(sql_regcase)
        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;
        }
        

diff --git a/ext/fdf/fdf.c b/ext/fdf/fdf.c
index 6b40b5cf7420786c8f38341d8e0f3dbbefb70ec4..19c51092964c31ac926104ebbe9f5b395b5492d1 100644 (file)
--- a/ext/fdf/fdf.c
+++ b/ext/fdf/fdf.c
@@ -129,7 +129,7 @@ PHP_FUNCTION(fdf_open) {
        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 @@ PHP_FUNCTION(fdf_close) {
        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 @@ PHP_FUNCTION(fdf_get_value) {
        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 @@ PHP_FUNCTION(fdf_set_value) {
        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 @@ PHP_FUNCTION(fdf_next_field_name) {
        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 @@ PHP_FUNCTION(fdf_set_ap) {
        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 @@ PHP_FUNCTION(fdf_set_status) {
        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 @@ PHP_FUNCTION(fdf_get_status) {
        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 @@ PHP_FUNCTION(fdf_set_file) {
        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 @@ PHP_FUNCTION(fdf_get_file) {
        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 @@ PHP_FUNCTION(fdf_save) {
        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 @@ PHP_FUNCTION(fdf_add_template) {
        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;
        }
 

diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c
index bcdc91441ae965e31091f0ff764a405db67ff27c..07ff5cfe31198b4754402bc9e6bdddf1250dca7a 100644 (file)
--- a/ext/gettext/gettext.c
+++ b/ext/gettext/gettext.c
@@ -51,7 +51,7 @@ PHP_FUNCTION(textdomain)
     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 @@ PHP_FUNCTION(gettext)
     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 @@ PHP_FUNCTION(dgettext)
        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 @@ PHP_FUNCTION(dcgettext)
        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 @@ PHP_FUNCTION(bindtextdomain)
        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;
        }

diff --git a/ext/hyperwave/hw.c b/ext/hyperwave/hw.c
index 165d41bcd770b672e080973c92f73d28919079b8..72223fbd80c91553a2f51074f95211a63a3e888f 100644 (file)
--- a/ext/hyperwave/hw.c
+++ b/ext/hyperwave/hw.c
@@ -916,7 +916,7 @@ PHP_FUNCTION(hw_close) {
        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 @@ PHP_FUNCTION(hw_info)
        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 @@ PHP_FUNCTION(hw_error)
        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 @@ PHP_FUNCTION(hw_errormsg)
        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 @@ char *php_hw_command(INTERNAL_FUNCTION_PARAMETERS, int comm) {
        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 @@ PHP_FUNCTION(hw_dummy) {
        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 @@ PHP_FUNCTION(hw_getobject) {
        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 @@ PHP_FUNCTION(hw_children) {
        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 @@ PHP_FUNCTION(hw_childrenobj) {
        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 @@ PHP_FUNCTION(hw_getchildcoll) {
        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 @@ PHP_FUNCTION(hw_getchildcollobj) {
        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 @@ PHP_FUNCTION(hw_docbyanchorobj) {
        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 @@ PHP_FUNCTION(hw_getobjectbyquery) {
        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 @@ PHP_FUNCTION(hw_getobjectbyqueryobj) {
        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 @@ PHP_FUNCTION(hw_getobjectbyquerycoll) {
        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 @@ PHP_FUNCTION(hw_getobjectbyquerycollobj) {
        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 @@ PHP_FUNCTION(hw_getchilddoccoll) {
        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 @@ PHP_FUNCTION(hw_getchilddoccollobj) {
        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 @@ PHP_FUNCTION(hw_getanchors) {
        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 @@ PHP_FUNCTION(hw_getanchorsobj) {
        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 @@ PHP_FUNCTION(hw_getusername) {
        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 @@ PHP_FUNCTION(hw_identify) {
        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 @@ PHP_FUNCTION(hw_objrec2array) {
 
        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 @@ PHP_FUNCTION(hw_array2objrec) {
        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 @@ PHP_FUNCTION(hw_incollections) {
        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 @@ PHP_FUNCTION(hw_inscoll) {
        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 @@ PHP_FUNCTION(hw_insdoc) {
        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 @@ PHP_FUNCTION(hw_getsrcbydestobj) {
        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 @@ PHP_FUNCTION(hw_mapid) {
        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 @@ PHP_FUNCTION(hw_getrellink) {
        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 @@ PHP_FUNCTION(hw_connection_info)
        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);

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index ca3204162814e63065bd6db45ec54b4be27d7a95..28b858463b1d7b1fadcd7230e132be2499bac1b4 100644 (file)
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -321,7 +321,7 @@ PHP_FUNCTION(ldap_connect)
                case 1: {
                                pval **yyhost;
 
-                               if (getParametersEx(1, &yyhost) == FAILURE) {
+                               if (zend_get_parameters_ex(1, &yyhost) == FAILURE) {
                                        RETURN_FALSE;
                                }
 
@@ -338,7 +338,7 @@ PHP_FUNCTION(ldap_connect)
                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 @@ PHP_FUNCTION(ber_free)
 {
         pval **berp;
                
-       if ( getParametersEx(1,&berp) == FAILURE ) {
+       if ( zend_get_parameters_ex(1,&berp) == FAILURE ) {
                WRONG_PARAM_COUNT;
        }
        
@@ -469,7 +469,7 @@ PHP_FUNCTION(ldap_bind)
 
        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 @@ PHP_FUNCTION(ldap_bind)
                        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 @@ PHP_FUNCTION(ldap_unbind)
        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 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
 
        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 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
                        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 @@ PHP_FUNCTION(ldap_free_result)
        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 @@ PHP_FUNCTION(ldap_count_entries)
        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 @@ PHP_FUNCTION(ldap_first_entry)
        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 @@ PHP_FUNCTION(ldap_next_entry)
        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 @@ PHP_FUNCTION(ldap_get_entries)
        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 @@ PHP_FUNCTION(ldap_first_attribute)
        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 @@ PHP_FUNCTION(ldap_next_attribute)
        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 @@ PHP_FUNCTION(ldap_get_attributes)
        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 @@ PHP_FUNCTION(ldap_get_values)
        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 @@ PHP_FUNCTION(ldap_get_dn)
        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 @@ PHP_FUNCTION(ldap_explode_dn)
        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 @@ PHP_FUNCTION(ldap_dn2ufn)
        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 @@ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper)
        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 @@ PHP_FUNCTION(ldap_delete)
        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;
        }
 

diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
index a5a714167ea8a5c97f833088e4e4a073fa8c1a24..082b20e6de7fac68a882747bf883e0f72acdbac1 100644 (file)
--- a/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@ -182,7 +182,7 @@ PHP_FUNCTION(mcrypt_create_iv)
        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 @@ PHP_FUNCTION(mcrypt_get_cipher_name)
        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 @@ PHP_FUNCTION(mcrypt_get_key_size)
 {
        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 @@ PHP_FUNCTION(mcrypt_get_block_size)
 {
        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 @@ PHP_FUNCTION(mcrypt_ofb)
        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 @@ PHP_FUNCTION(mcrypt_cfb)
        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 @@ PHP_FUNCTION(mcrypt_cbc)
        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 @@ PHP_FUNCTION(mcrypt_ecb)
        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;

diff --git a/ext/mhash/mhash.c b/ext/mhash/mhash.c
index d2e3e389d69f165dee424f68497d9daee55abee2..08f669b77098ae9325b5401988a2a49f87e01e8c 100644 (file)
--- a/ext/mhash/mhash.c
+++ b/ext/mhash/mhash.c
@@ -76,7 +76,7 @@ PHP_FUNCTION(mhash_get_block_size)
 {
        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 @@ PHP_FUNCTION(mhash_get_hash_name)
        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 @@ PHP_FUNCTION(mhash)
        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;
        }
 

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index a961ac4cba71aa398d2cdb95f8843bd0e8256c1e..00bdbaf2f0b45307afcfc46c0cc5e415460d9960 100644 (file)
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -312,7 +312,7 @@ void php_mssql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
                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 @@ void php_mssql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
                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 @@ void php_mssql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
                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 @@ PHP_FUNCTION(mssql_close)
                        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 @@ PHP_FUNCTION(mssql_select_db)
        
        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 @@ PHP_FUNCTION(mssql_query)
 
        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 @@ PHP_FUNCTION(mssql_free_result)
        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 @@ PHP_FUNCTION(mssql_num_rows)
        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 @@ PHP_FUNCTION(mssql_num_fields)
        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 @@ PHP_FUNCTION(mssql_fetch_row)
        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 @@ static void php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS)
        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;
        }
 

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 279fe377226b5982a3046342ccb7d3de9dd29a51..7094ba0764db43427a0b19dcde5dacfb9e44c05f 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -392,7 +392,7 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
                        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 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
                        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 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
                        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 @@ PHP_FUNCTION(mysql_close)
                        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 @@ PHP_FUNCTION(mysql_select_db)
        
        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 @@ PHP_FUNCTION(mysql_create_db)
        
        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 @@ PHP_FUNCTION(mysql_drop_db)
        
        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 @@ PHP_FUNCTION(mysql_query)
        
        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 @@ PHP_FUNCTION(mysql_db_query)
        
        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 @@ PHP_FUNCTION(mysql_list_dbs)
                        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 @@ PHP_FUNCTION(mysql_list_tables)
        
        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 @@ PHP_FUNCTION(mysql_list_fields)
        
        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 @@ PHP_FUNCTION(mysql_error)
                        }
                        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 @@ PHP_FUNCTION(mysql_errno)
                        }
                        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 @@ PHP_FUNCTION(mysql_affected_rows)
                        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 @@ PHP_FUNCTION(mysql_insert_id)
                        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 @@ PHP_FUNCTION(mysql_result)
 
        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 @@ PHP_FUNCTION(mysql_num_rows)
        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 @@ PHP_FUNCTION(mysql_num_fields)
        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 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
 
        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 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
                        }
                        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 @@ PHP_FUNCTION(mysql_data_seek)
        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 @@ PHP_FUNCTION(mysql_fetch_lengths)
        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 @@ PHP_FUNCTION(mysql_fetch_field)
        
        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 @@ PHP_FUNCTION(mysql_field_seek)
        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 @@ static void php_mysql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type)
        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 @@ PHP_FUNCTION(mysql_free_result)
        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;
        }
        

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 7c9580a7100e4e9b362ed3cd9de541b77029af6d..945ec88994b144d402c1c3bd8f03c8140394570c 100644 (file)
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -2029,7 +2029,7 @@ static void oci_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent,int exclu
     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 @@ static void oci_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent,int exclu
                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 @@ PHP_FUNCTION(ocidefinebyname)
        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 @@ PHP_FUNCTION(ocibindbyname)
        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 @@ PHP_FUNCTION(ocisavelob)
                }
 
                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 @@ PHP_FUNCTION(ocisavelob)
                        } 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 @@ PHP_FUNCTION(ocisavelobfile)
                        RETURN_FALSE;
                }
 
-           if (getParametersEx(1, &arg) == FAILURE) {
+           if (zend_get_parameters_ex(1, &arg) == FAILURE) {
                WRONG_PARAM_COUNT;
        }
 
@@ -2658,7 +2658,7 @@ PHP_FUNCTION(ociwritelobtofile)
                        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 @@ PHP_FUNCTION(ocinewdescriptor)
 
     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 @@ PHP_FUNCTION(ocirollback)
        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 @@ PHP_FUNCTION(ocicommit)
        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 @@ PHP_FUNCTION(ocicolumnname)
        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 @@ PHP_FUNCTION(ocicolumnsize)
        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 @@ PHP_FUNCTION(ocicolumntype)
        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 @@ PHP_FUNCTION(ocicolumnisnull)
        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 @@ PHP_FUNCTION(ociinternaldebug)
        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 @@ PHP_FUNCTION(ociexecute)
        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 @@ PHP_FUNCTION(ocicancel)
        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 @@ PHP_FUNCTION(ocifetch)
        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 @@ PHP_FUNCTION(ocifetchinto)
        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 @@ PHP_FUNCTION(ocifetchstatement)
        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 @@ PHP_FUNCTION(ocifreestatement)
        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 @@ PHP_FUNCTION(ocilogoff)
        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 @@ PHP_FUNCTION(ocierror)
 
        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 @@ PHP_FUNCTION(ocinumcols)
        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 @@ PHP_FUNCTION(ociparse)
        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 @@ PHP_FUNCTION(ocisetprefetch)
        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 @@ PHP_FUNCTION(ocinewcursor)
        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 @@ PHP_FUNCTION(ociresult)
        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 @@ PHP_FUNCTION(ociserverversion)
        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 @@ PHP_FUNCTION(ocistatementtype)
        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 @@ PHP_FUNCTION(ocirowcount)
        oci_statement *statement;
        ub4 rowcount;
 
-       if (getParametersEx(1, &stmt) == FAILURE) {
+       if (zend_get_parameters_ex(1, &stmt) == FAILURE) {
                WRONG_PARAM_COUNT;
        }
 

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 60556271a07f317ace83ca1b190efca3828d60c5..29fa4724a30d9f26b87810114e7b1dad4d93a36c 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -484,7 +484,7 @@ void php_odgbc_fetch_attribs(INTERNAL_FUNCTION_PARAMETERS, int mode)
        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 @@ void odbc_transact(INTERNAL_FUNCTION_PARAMETERS, int type)
        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 @@ PHP_FUNCTION(odbc_prepare)
        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 @@ PHP_FUNCTION(odbc_execute)
        
        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 @@ PHP_FUNCTION(odbc_cursor)
        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 @@ PHP_FUNCTION(odbc_exec)
 
        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 @@ PHP_FUNCTION(odbc_fetch_into)
 
        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 @@ PHP_FUNCTION(odbc_fetch_into)
 
        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 @@ PHP_FUNCTION(solid_fetch_prev)
        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 @@ PHP_FUNCTION(odbc_fetch_row)
 
        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 @@ PHP_FUNCTION(odbc_result)
        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 @@ PHP_FUNCTION(odbc_result_all)
 
        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 @@ PHP_FUNCTION(odbc_free_result)
        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 @@ void odbc_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
         */
        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 @@ PHP_FUNCTION(odbc_close)
        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 @@ PHP_FUNCTION(odbc_num_rows)
        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 @@ PHP_FUNCTION(odbc_num_fields)
        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 @@ PHP_FUNCTION(odbc_field_name)
        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 @@ PHP_FUNCTION(odbc_field_type)
        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 @@ PHP_FUNCTION(odbc_field_len)
        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 @@ PHP_FUNCTION(odbc_field_num)
        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 @@ PHP_FUNCTION(odbc_autocommit)
 
        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 @@ PHP_FUNCTION(odbc_setoption)
        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 @@ PHP_FUNCTION(odbc_tables)
 
        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 @@ PHP_FUNCTION(odbc_columns)
 
        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 @@ PHP_FUNCTION(odbc_columnprivileges)
 
        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 @@ PHP_FUNCTION(odbc_foreignkeys)
 
        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 @@ PHP_FUNCTION(odbc_gettypeinfo)
 
        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 @@ PHP_FUNCTION(odbc_primarykeys)
 
        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 @@ PHP_FUNCTION(odbc_procedurecolumns)
 
        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 @@ PHP_FUNCTION(odbc_procedures)
 
        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 @@ PHP_FUNCTION(odbc_specialcolumns)
 
        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 @@ PHP_FUNCTION(odbc_statistics)
 
        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 @@ PHP_FUNCTION(odbc_tableprivileges)
 
        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);

diff --git a/ext/oracle/oracle.c b/ext/oracle/oracle.c
index 464eee04a32bac7f9a18aec04b82a27122040b36..8ba509da60175bfdf686e609a3f81eb58ab92afd 100644 (file)
--- a/ext/oracle/oracle.c
+++ b/ext/oracle/oracle.c
@@ -385,7 +385,7 @@ void ora_do_logon(INTERNAL_FUNCTION_PARAMETERS, int persistent)
        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 @@ PHP_FUNCTION(ora_logoff)
        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 @@ PHP_FUNCTION(ora_open)
        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 @@ PHP_FUNCTION(ora_close)
        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 @@ PHP_FUNCTION(ora_commitoff)
        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 @@ PHP_FUNCTION(ora_commiton)
        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 @@ PHP_FUNCTION(ora_commit)
        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 @@ PHP_FUNCTION(ora_rollback)
        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 @@ PHP_FUNCTION(ora_parse)
 
        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 @@ PHP_FUNCTION(ora_bind)
 
        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 @@ PHP_FUNCTION(ora_exec)
        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 @@ PHP_FUNCTION(ora_numcols)
        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 @@ PHP_FUNCTION(ora_numrows)
        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 @@ PHP_FUNCTION(ora_do)
        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 @@ PHP_FUNCTION(ora_fetch)
        pval **arg;
        oraCursor *cursor;
 
-       if (getParametersEx(1, &arg) == FAILURE) {
+       if (zend_get_parameters_ex(1, &arg) == FAILURE) {
                WRONG_PARAM_COUNT;
        }
 
@@ -1060,11 +1060,11 @@ PHP_FUNCTION(ora_fetch_into)
 
        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 @@ PHP_FUNCTION(ora_columnname)
        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 @@ PHP_FUNCTION(ora_columntype)
        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 @@ PHP_FUNCTION(ora_columnsize)
        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 @@ PHP_FUNCTION(ora_getcolumn)
        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 @@ PHP_FUNCTION(ora_error)
        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 @@ PHP_FUNCTION(ora_errorcode)
        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);

diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 310a996b6dc291bf2aba0ba007fae811b9d72e3e..270dbd4b39013f5d319e36902c5a60bc7f7e0009 100644 (file)
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -330,13 +330,13 @@ static void _pcre_match(INTERNAL_FUNCTION_PARAMETERS, int global)
        /* 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 @@ static void _pcre_match(INTERNAL_FUNCTION_PARAMETERS, int global)
                        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 @@ PHP_FUNCTION(preg_replace)
        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 @@ PHP_FUNCTION(preg_split)
 
        /* 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 @@ PHP_FUNCTION(preg_quote)
                         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 @@ PHP_FUNCTION(preg_grep)
        
        /* 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;
        }
        

diff --git a/ext/pdf/pdf.c b/ext/pdf/pdf.c
index 03d9dd040ebb2c17d5b1e3fb046b318f22b09c7b..4497da9cb054f25fc495c38509116f8e08872d85 100644 (file)
--- a/ext/pdf/pdf.c
+++ b/ext/pdf/pdf.c
@@ -365,7 +365,7 @@ PHP_FUNCTION(pdf_open) {
        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;
        }
 

diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 9614a2c843e5b46d094ceef120dfcbc6c5dbbdc5..980d8011df3bc46cb292794a24c35a13c8d7d482 100644 (file)
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -92,7 +92,7 @@ PHP_FUNCTION(readline)
        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 @@ PHP_FUNCTION(readline_info)
        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 @@ PHP_FUNCTION(readline_add_history)
        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 @@ PHP_FUNCTION(readline_read_history)
        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 @@ PHP_FUNCTION(readline_write_history)
        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 @@ PHP_FUNCTION(readline_completion_function)
        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;
        }
 

diff --git a/ext/session/session.c b/ext/session/session.c
index e12e1c5845b0fe1fef53409f8467146273a87942..9090fea28bc85ca0e96db46021c175dc689fa523 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -749,7 +749,7 @@ PHP_FUNCTION(session_name)
 
        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 @@ PHP_FUNCTION(session_module_name)
 
        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 @@ PHP_FUNCTION(session_set_save_handler)
        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 @@ PHP_FUNCTION(session_save_path)
 
        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 @@ PHP_FUNCTION(session_id)
        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 @@ PHP_FUNCTION(session_register)
        } 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 @@ PHP_FUNCTION(session_unregister)
        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 @@ PHP_FUNCTION(session_is_registered)
        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 @@ PHP_FUNCTION(session_decode)
        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;
        }
 

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 707684efb8dfbb6edce4a40624bd1c045b6962e8..02a855a5d0d89d77ea62493c3d6072af13056741 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -202,7 +202,7 @@ PHP_FUNCTION(krsort)
        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 @@ PHP_FUNCTION(ksort)
        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 @@ PHP_FUNCTION(count)
        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 @@ PHP_FUNCTION(asort)
        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 @@ PHP_FUNCTION(arsort)
        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 @@ PHP_FUNCTION(sort)
        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 @@ PHP_FUNCTION(rsort)
        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 @@ PHP_FUNCTION(usort)
        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 @@ PHP_FUNCTION(uasort)
        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 @@ PHP_FUNCTION(uksort)
        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 @@ PHP_FUNCTION(end)
        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 @@ PHP_FUNCTION(prev)
        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 @@ PHP_FUNCTION(next)
        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 @@ PHP_FUNCTION(reset)
        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 @@ PHP_FUNCTION(current)
        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 @@ PHP_FUNCTION(key)
        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 @@ PHP_FUNCTION(min)
        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 @@ PHP_FUNCTION(min)
                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 @@ PHP_FUNCTION(max)
        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 @@ PHP_FUNCTION(max)
                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 @@ PHP_FUNCTION(array_walk) {
        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 @@ PHP_FUNCTION(in_array)
                  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 @@ PHP_FUNCTION(extract)
 
        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 @@ PHP_FUNCTION(extract)
                        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 @@ PHP_FUNCTION(compact)
        
        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 @@ PHP_FUNCTION(range)
        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 @@ PHP_FUNCTION(shuffle)
 {
        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 @@ PHP_FUNCTION(array_push)
        
        /* 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 @@ static void _phpi_pop(INTERNAL_FUNCTION_PARAMETERS, int off_the_end)
        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 @@ PHP_FUNCTION(array_unshift)
        
        /* 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 @@ PHP_FUNCTION(array_splice)
        
        /* 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 @@ PHP_FUNCTION(array_slice)
 
        /* 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 @@ PHP_FUNCTION(array_merge)
        
        /* 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 @@ PHP_FUNCTION(array_keys)
        
        /* 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 @@ PHP_FUNCTION(array_values)
                           **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 @@ PHP_FUNCTION(array_count_values)
        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 @@ PHP_FUNCTION(array_reverse)
        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 @@ PHP_FUNCTION(array_pad)
        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 @@ PHP_FUNCTION(array_flip)
        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 @@ PHP_FUNCTION(array_multisort)
        
        /* 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;
        }

diff --git a/ext/standard/assert.c b/ext/standard/assert.c
index 87d5222679570d676dee666b8b78890ea8cb7c4b..e771e31dcae88b05a0e839849c7ae348389e782a 100644 (file)
--- a/ext/standard/assert.c
+++ b/ext/standard/assert.c
@@ -174,7 +174,7 @@ PHP_FUNCTION(assert)
                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 @@ PHP_FUNCTION(assert_options)
        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;
        }
 

diff --git a/ext/standard/base64.c b/ext/standard/base64.c
index 9f9552070365ad5e57510c08ecc06df4812c83d0..e98cdcccc6dcd1a9736c4ed0e113a15909a660d0 100644 (file)
--- a/ext/standard/base64.c
+++ b/ext/standard/base64.c
@@ -146,7 +146,7 @@ PHP_FUNCTION(base64_encode) {
        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 @@ PHP_FUNCTION(base64_decode) {
        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);

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index ac918bd85805a845996161a8ca7ad3a0580f303e..1328f9c20df0892f0f500fbb71da4bd853c0fae0 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -445,7 +445,7 @@ PHP_FUNCTION(getenv)
        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 @@ PHP_FUNCTION(putenv)
        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 @@ PHP_FUNCTION(intval)
        
        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 @@ PHP_FUNCTION(doubleval)
 {
        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 @@ PHP_FUNCTION(strval)
 {
        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 @@ PHP_FUNCTION(sleep)
 {
        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 @@ PHP_FUNCTION(usleep)
 #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 @@ PHP_FUNCTION(gettype)
 {
        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 @@ PHP_FUNCTION(settype)
        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 @@ PHP_FUNCTION(get_cfg_var)
        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 @@ PHP_FUNCTION(set_magic_quotes_runtime)
        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 @@ void php_is_type(INTERNAL_FUNCTION_PARAMETERS,int type)
 {
        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 @@ PHP_FUNCTION(error_log)
 
        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 @@ PHP_FUNCTION(error_log)
                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 @@ PHP_FUNCTION(error_log)
                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 @@ PHP_FUNCTION(call_user_func)
        }
        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 @@ PHP_FUNCTION(call_user_method)
        }
        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 @@ PHP_FUNCTION(highlight_file)
        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 @@ PHP_FUNCTION(highlight_string)
        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 @@ PHP_FUNCTION(ini_get)
 {
        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 @@ PHP_FUNCTION(ini_alter)
        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 @@ PHP_FUNCTION(ini_restore)
 {
        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 @@ PHP_FUNCTION(print_r)
 {
        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 @@ PHP_FUNCTION(ignore_user_abort)
         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 @@ PHP_FUNCTION(getservbyname)
        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 @@ PHP_FUNCTION(getservbyport)
        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 @@ PHP_FUNCTION(getprotobyname)
        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 @@ PHP_FUNCTION(getprotobynumber)
        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 @@ PHP_FUNCTION(extension_loaded)
 {
        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 @@ PHP_FUNCTION(get_extension_funcs)
        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;
        }
 

diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c
index 28f1c3babcc95a7a5450532fb1cf8460ea01a7a7..8c5723476c32f1ccb16a035058ce77b25c1314e4 100644 (file)
--- a/ext/standard/crypt.c
+++ b/ext/standard/crypt.c
@@ -129,12 +129,12 @@ PHP_FUNCTION(crypt)
 
        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);

diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index cbbed77dbdad7e9733f7e5583ae8d382526b93eb..8d7ffa2a72e02f84c1357b997386bbc6d5168bfa 100644 (file)
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -76,7 +76,7 @@ static zend_class_entry *dir_class_entry_ptr;
                } 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 @@ static void _php_do_opendir(INTERNAL_FUNCTION_PARAMETERS, int createobject)
        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 @@ PHP_FUNCTION(chdir)
        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);

diff --git a/ext/standard/dl.c b/ext/standard/dl.c
index 8aa0c23d3c53c034089a759c3c6385bb9df693ba..3712fa6333248cb4f0fc4157cbb37230dd53a93c 100644 (file)
--- a/ext/standard/dl.c
+++ b/ext/standard/dl.c
@@ -60,7 +60,7 @@ void dl(INTERNAL_FUNCTION_PARAMETERS)
        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;
        }
 

diff --git a/ext/standard/dns.c b/ext/standard/dns.c
index f8ca8f28137265db8d869ebec45451c5b7bd3599..f78726c5169b7b9ddbd3301bf50be2452ad6c8bf 100644 (file)
--- a/ext/standard/dns.c
+++ b/ext/standard/dns.c
@@ -57,7 +57,7 @@ PHP_FUNCTION(gethostbyaddr)
 {
        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 @@ PHP_FUNCTION(gethostbyname)
 {
        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 @@ PHP_FUNCTION(gethostbynamel)
        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 @@ PHP_FUNCTION(checkdnsrr)
        
        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);

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 5a70ddd36830b41ed62144a06b589531d7c49ed0..0dae49bb9c5dcf867a7983291abd78e6eb2e2326 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -346,7 +346,7 @@ PHP_FUNCTION(flock)
     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 @@ PHP_FUNCTION(get_meta_tags)
        /* 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 @@ PHP_FUNCTION(file)
        /* 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 @@ PHP_FUNCTION(tempnam)
        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 @@ PHP_FUNCTION(fopen)
        
        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 @@ PHP_FUNCTION(fclose)
        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 @@ PHP_FUNCTION(popen)
        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 @@ PHP_FUNCTION(pclose)
        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 @@ PHP_FUNCTION(feof)
        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 @@ PHP_FUNCTION(set_socket_blocking)
        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 @@ PHP_FUNCTION(fgets)
        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 @@ PHP_FUNCTION(fgetc) {
        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 @@ PHP_FUNCTION(fgetss)
 
        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 @@ PHP_FUNCTION(fwrite)
 
        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 @@ PHP_FUNCTION(set_file_buffer)
       
        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 @@ PHP_FUNCTION(rewind)
        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 @@ PHP_FUNCTION(ftell)
        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 @@ PHP_FUNCTION(fseek)
        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 @@ PHP_FUNCTION(mkdir)
        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 @@ PHP_FUNCTION(rmdir)
        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 @@ PHP_FUNCTION(readfile)
        /* 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 @@ PHP_FUNCTION(umask)
        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 @@ PHP_FUNCTION(fpassthru)
        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 @@ PHP_FUNCTION(rename)
        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 @@ PHP_FUNCTION(copy)
        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 @@ PHP_FUNCTION(fread)
        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 @@ PHP_FUNCTION(fgetcsv) {
        
        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 @@ PHP_FUNCTION(fd_set)
                 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 @@ PHP_FUNCTION(fd_set)
         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 @@ PHP_FUNCTION(select)
        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 @@ PHP_FUNCTION(fd_isset)
        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;
        }
 

diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c
index 270c6520ed187660ee5f22e3b4338b55bfa9f4dc..f7834233d06277e2f7b2df38e0cb1b3d75519d73 100644 (file)
--- a/ext/standard/formatted_print.c
+++ b/ext/standard/formatted_print.c
@@ -378,7 +378,7 @@ php_formatted_print(int ht, int *len)
        }
        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);
        }

diff --git a/ext/standard/html.c b/ext/standard/html.c
index 30631295031e8c81f9e80c9b24fe32c409bcbcc2..6e126256012fb45dcc0c14ff090e468176eda97e 100644 (file)
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -50,7 +50,7 @@ static void php_html_entities(INTERNAL_FUNCTION_PARAMETERS, int all)
     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 @@ PHP_FUNCTION(get_html_translation_table)
        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;
     }
 

diff --git a/ext/standard/image.c b/ext/standard/image.c
index cec79148a66d8e1db7e5fcbf4c201a79e803b2f5..5f5f3bf25af45899aefb073302474445970ac7a7 100644 (file)
--- a/ext/standard/image.c
+++ b/ext/standard/image.c
@@ -306,14 +306,14 @@ PHP_FUNCTION(getimagesize)
        
        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)) {

diff --git a/ext/standard/info.c b/ext/standard/info.c
index 4d4974b6d593a98089fae00db6982e768f952f18..fcc350756bde0c861f6b67339f9712e885ca8842 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -452,7 +452,7 @@ PHP_FUNCTION(phpinfo)
                        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 @@ PHP_FUNCTION(phpcredits)
                        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);

diff --git a/ext/standard/iptc.c b/ext/standard/iptc.c
index 9fbf33f8fc952afd548aa4472d217129f60bd127..88922be658ccc1336f51adadef8721239e393416 100644 (file)
--- a/ext/standard/iptc.c
+++ b/ext/standard/iptc.c
@@ -173,7 +173,7 @@ PHP_FUNCTION(iptcembed)
 
     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 @@ PHP_FUNCTION(iptcembed)
         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 @@ PHP_FUNCTION(iptcparse)
        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);

diff --git a/ext/standard/link.c b/ext/standard/link.c
index 1acbcdc4c4fe8d97c5f7b15b548615b6d5d0a0d1..ca061ba9c03277edd42ac06cc866e086fb7e09f8 100644 (file)
--- a/ext/standard/link.c
+++ b/ext/standard/link.c
@@ -57,7 +57,7 @@ PHP_FUNCTION(readlink)
        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 @@ PHP_FUNCTION(linkinfo)
        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 @@ PHP_FUNCTION(symlink)
        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 @@ PHP_FUNCTION(link)
        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 @@ PHP_FUNCTION(unlink)
        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);

diff --git a/ext/standard/mail.c b/ext/standard/mail.c
index 7ff1e584a9926f52a5892bd593f0c47ace19a503..376db3874df6ad3cbc881e0071ae7fecc2cfaad1 100644 (file)
--- a/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@ -62,7 +62,7 @@ PHP_FUNCTION(mail)
        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: */

diff --git a/ext/standard/math.c b/ext/standard/math.c
index 0ab4fbc16c12c5240873ebdd72c5fa132aabc60a..9176c11d6697f38b3af06cf36ca499d0a723d88e 100644 (file)
--- a/ext/standard/math.c
+++ b/ext/standard/math.c
@@ -39,7 +39,7 @@ PHP_FUNCTION(abs)
 {
        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 @@ PHP_FUNCTION(ceil)
 {
        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(ceil)
 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 @@ PHP_FUNCTION(round)
 {
        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 @@ PHP_FUNCTION(sin)
 {
        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 @@ PHP_FUNCTION(cos)
 {
        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 @@ PHP_FUNCTION(tan)
 {
        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 @@ PHP_FUNCTION(asin)
 {
        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 @@ PHP_FUNCTION(acos)
 {
        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 @@ PHP_FUNCTION(atan)
 {
        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 @@ PHP_FUNCTION(atan2)
 {
        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 @@ PHP_FUNCTION(pow)
 {
        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 @@ PHP_FUNCTION(exp)
 {
        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 @@ PHP_FUNCTION(log)
 {
        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 @@ PHP_FUNCTION(log10)
 {
        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 @@ PHP_FUNCTION(sqrt)
 {
        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 @@ PHP_FUNCTION(deg2rad)
 {
        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 @@ PHP_FUNCTION(rad2deg)
 {
        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 @@ PHP_FUNCTION(bindec)
        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 @@ PHP_FUNCTION(hexdec)
        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 @@ PHP_FUNCTION(octdec)
        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 @@ PHP_FUNCTION(decbin)
        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 @@ PHP_FUNCTION(decoct)
        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 @@ PHP_FUNCTION(dechex)
        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 @@ PHP_FUNCTION(base_convert)
        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 @@ PHP_FUNCTION(number_format)
        
        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 @@ PHP_FUNCTION(number_format)
                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);

diff --git a/ext/standard/md5.c b/ext/standard/md5.c
index e89e177d37cb5f7eec83ee32607c0ab759ebfbda..2f4d7caddcb3cca77618a08a9e602d03a8ef2cba 100644 (file)
--- a/ext/standard/md5.c
+++ b/ext/standard/md5.c
@@ -36,7 +36,7 @@ PHP_NAMED_FUNCTION(php_if_md5)
        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);

diff --git a/ext/standard/metaphone.c b/ext/standard/metaphone.c
index 17aec1ece2d2710dffff3c0e092a9ed8101762be..c01d6c79e4c03d3f762edbebc79554050b4f12aa 100644 (file)
--- a/ext/standard/metaphone.c
+++ b/ext/standard/metaphone.c
@@ -51,10 +51,10 @@ PHP_FUNCTION(metaphone)
        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;
        }
 

diff --git a/ext/standard/microtime.c b/ext/standard/microtime.c
index 1eec292e187ac9e16862a005c448bdedcb5f83bf..847565e60386a54448b4426fac2f3a61cfd3d84c 100644 (file)
--- a/ext/standard/microtime.c
+++ b/ext/standard/microtime.c
@@ -97,7 +97,7 @@ PHP_FUNCTION(getrusage)
        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;

diff --git a/ext/standard/rand.c b/ext/standard/rand.c
index a5667595f24f09255bb84f77c631e68c6d311735..fae8f7e01ea721db2cd7d82c1987012e78427ff3 100644 (file)
--- a/ext/standard/rand.c
+++ b/ext/standard/rand.c
@@ -193,7 +193,7 @@ PHP_FUNCTION(srand)
 {
        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 @@ PHP_FUNCTION(mt_srand)
        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 @@ PHP_FUNCTION(rand)
                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 @@ PHP_FUNCTION(mt_rand)
                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);

diff --git a/ext/standard/reg.c b/ext/standard/reg.c
index 39107fa83b2ce188e0af1ad302c2ca96e168e5d3..5f5449a2f8973498c556b3ba662c37f1c91f17bf 100644 (file)
--- a/ext/standard/reg.c
+++ b/ext/standard/reg.c
@@ -193,7 +193,7 @@ static void php_ereg(INTERNAL_FUNCTION_PARAMETERS, int icase)
 
        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 @@ static void php_ereg(INTERNAL_FUNCTION_PARAMETERS, int icase)
                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 @@ static void php_ereg_replace(INTERNAL_FUNCTION_PARAMETERS, int icase)
        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 @@ PHP_FUNCTION(split)
        
        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 @@ PHPAPI PHP_FUNCTION(sql_regcase)
        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;
        }
        

diff --git a/ext/standard/soundex.c b/ext/standard/soundex.c
index 25946e4854413f5a82df370de9994aa5655e2f0e..22bc35d9749d7c1027d34ca9449ab12cd6458e17 100644 (file)
--- a/ext/standard/soundex.c
+++ b/ext/standard/soundex.c
@@ -61,7 +61,7 @@ PHP_FUNCTION(soundex)
         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);

diff --git a/ext/standard/string.c b/ext/standard/string.c
index dd17577083528ec8ed2df443d84495f23c6e35dc..1be4980757a58031ced6b7a08e3fbc023fc13d99 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -66,7 +66,7 @@ PHP_FUNCTION(bin2hex)
        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 @@ PHP_FUNCTION(strspn)
 {
        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 @@ PHP_FUNCTION(strcspn)
 {
        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 @@ PHP_FUNCTION(chop)
 {
        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 @@ PHP_FUNCTION(trim)
 {
        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 @@ PHP_FUNCTION(ltrim)
 {
        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 @@ PHP_FUNCTION(explode)
 {
        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 @@ PHP_FUNCTION(implode)
 {
        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 @@ PHP_FUNCTION(strtok)
        
        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 @@ PHP_FUNCTION(strtoupper)
 {
        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 @@ PHP_FUNCTION(strtolower)
        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 @@ PHP_FUNCTION(basename)
        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 @@ PHP_FUNCTION(dirname)
        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 @@ PHP_FUNCTION(stristr)
        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 @@ PHP_FUNCTION(strstr)
        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 @@ PHP_FUNCTION(strpos)
        
        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 @@ PHP_FUNCTION(strrpos)
        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 @@ PHP_FUNCTION(strrchr)
        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 @@ PHP_FUNCTION(chunk_split)
        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 @@ PHP_FUNCTION(substr)
        
        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 @@ PHP_FUNCTION(substr_replace)
        
        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 @@ PHP_FUNCTION(quotemeta)
        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 @@ PHP_FUNCTION(ord)
 {
        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 @@ PHP_FUNCTION(chr)
        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 @@ PHP_FUNCTION(ucfirst)
 {
        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 @@ PHP_FUNCTION(ucwords)
        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 @@ PHP_FUNCTION(strtr)
        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 @@ PHP_FUNCTION(strrev)
        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 @@ PHP_FUNCTION(similar_text)
        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 @@ PHP_FUNCTION(addcslashes)
 {
        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 @@ PHP_FUNCTION(addslashes)
 {
        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 @@ PHP_FUNCTION(stripcslashes)
 {
        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 @@ PHP_FUNCTION(stripslashes)
 {
        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 @@ PHP_FUNCTION(str_replace)
        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 @@ static void php_hebrev(INTERNAL_FUNCTION_PARAMETERS,int convert_newlines)
        
        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 @@ PHP_FUNCTION(nl2br)
 {
        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 @@ PHP_FUNCTION(strip_tags)
 
        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 @@ PHP_FUNCTION(setlocale)
        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 @@ PHP_FUNCTION(parse_str)
        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 @@ PHP_FUNCTION(str_repeat)
        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 @@ PHP_FUNCTION(count_chars)
        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;
        }
        

diff --git a/ext/standard/syslog.c b/ext/standard/syslog.c
index aaec497fd968519683d85d6953324cde0d486049..5777bfe93f5fea0f934bad8dbcb0664c918bc22d 100644 (file)
--- a/ext/standard/syslog.c
+++ b/ext/standard/syslog.c
@@ -205,7 +205,7 @@ PHP_FUNCTION(define_syslog_variables)
 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 @@ PHP_FUNCTION(syslog)
 {
        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);

diff --git a/ext/standard/uniqid.c b/ext/standard/uniqid.c
index ced8f5c2a162023bb5cb091a7498ba0b5026ca76..59d351f9acfda06e6a8114ac8d107dbbd33e7d62 100644 (file)
--- a/ext/standard/uniqid.c
+++ b/ext/standard/uniqid.c
@@ -51,7 +51,7 @@ PHP_FUNCTION(uniqid)
        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);

diff --git a/ext/standard/url.c b/ext/standard/url.c
index 15258bd03a359cbcc788e3566116d16b7a6716c7..f24ec61d147d20b8f3a264ca7c07b659c315c6e7 100644 (file)
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -158,7 +158,7 @@ PHP_FUNCTION(parse_url)
        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 @@ PHP_FUNCTION(urlencode)
        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 @@ PHP_FUNCTION(urldecode)
        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 @@ PHP_FUNCTION(rawurlencode)
        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 @@ PHP_FUNCTION(rawurldecode)
        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);

diff --git a/ext/standard/var.c b/ext/standard/var.c
index cf2f241b6525491ec4992f7528a42fa6076f58bc..0b160c700ed5756fcc0e3add3b0de4acd99b41b1 100644 (file)
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -151,7 +151,7 @@ PHP_FUNCTION(var_dump)
        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 @@ PHP_FUNCTION(serialize)
 {
        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 @@ PHP_FUNCTION(unserialize)
 {
        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;
        }
 

diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c
index 0fcec3fd65b1428438a0689f3459209ef5c89eb8..69ca24c23a5f63b4d81ce8104a5bdf772210bb36 100644 (file)
--- a/ext/sysvsem/sysvsem.c
+++ b/ext/sysvsem/sysvsem.c
@@ -146,14 +146,14 @@ PHP_FUNCTION(sem_get)
 
        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 @@ PHP_FUNCTION(sem_get)
                        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 @@ static void php_sysvsem_semop(INTERNAL_FUNCTION_PARAMETERS, int acquire)
 
        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);

diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c
index f73f95dadd3138b9a988fa38c8e3f70c0f0d6bc3..53a4c83b38836616b0e5f694ca91b8ba18b03714 100644 (file)
--- a/ext/sysvshm/sysvshm.c
+++ b/ext/sysvshm/sysvshm.c
@@ -90,7 +90,7 @@ PHP_FUNCTION(shm_attach)
        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 @@ PHP_FUNCTION(shm_detach)
        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 @@ PHP_FUNCTION(shm_remove)
        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 @@ PHP_FUNCTION(shm_put_var)
        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 @@ PHP_FUNCTION(shm_get_var)
        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 @@ PHP_FUNCTION(shm_remove_var)
        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;
        }
 

diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index 5a5b566249d793dfc0c69f873851cb9fed7849ba..4c34d4c00d4b1b32fb44fa3f9b0c8d9bb6d805b1 100644 (file)
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -687,7 +687,7 @@ PHP_FUNCTION(wddx_serialize_value)
        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 @@ PHP_FUNCTION(wddx_serialize_vars)
        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 @@ PHP_FUNCTION(wddx_packet_start)
        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 @@ PHP_FUNCTION(wddx_packet_end)
        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 @@ PHP_FUNCTION(wddx_add_vars)
        
        /* 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 @@ PHP_FUNCTION(wddx_deserialize)
 {
        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;
        }
 

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index d6f52967914e13e6a9e1e514ead90c648669015f..b560b94b8cde6f83af163410ca1622bbe2ede172 100644 (file)
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -989,7 +989,7 @@ PHP_FUNCTION(xml_parser_create)
        
        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 @@ PHP_FUNCTION(xml_set_object)
        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 @@ PHP_FUNCTION(xml_set_element_handler)
        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 @@ PHP_FUNCTION(xml_set_character_data_handler)
        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 @@ PHP_FUNCTION(xml_set_processing_instruction_handler)
        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 @@ PHP_FUNCTION(xml_set_default_handler)
        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 @@ PHP_FUNCTION(xml_set_unparsed_entity_decl_handler)
        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 @@ PHP_FUNCTION(xml_set_notation_decl_handler)
        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 @@ PHP_FUNCTION(xml_set_external_entity_ref_handler)
        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 @@ PHP_FUNCTION(xml_parse)
        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 @@ PHP_FUNCTION(xml_parse_into_struct)
        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 @@ PHP_FUNCTION(xml_get_error_code)
        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 @@ PHP_FUNCTION(xml_error_string)
        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 @@ PHP_FUNCTION(xml_get_current_line_number)
        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 @@ PHP_FUNCTION(xml_get_current_column_number)
        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 @@ PHP_FUNCTION(xml_get_current_byte_index)
        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 @@ PHP_FUNCTION(xml_parser_free)
        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 @@ PHP_FUNCTION(xml_parser_set_option)
        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 @@ PHP_FUNCTION(xml_parser_get_option)
        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 @@ PHP_FUNCTION(utf8_encode)
        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 @@ PHP_FUNCTION(utf8_decode)
        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);

diff --git a/ext/yp/yp.c b/ext/yp/yp.c
index 64198f4f32d5e267616d9c9cc3dbf67162649314..2ea7d0046279f17cf484caf78eea00f16bfcb177 100644 (file)
--- a/ext/yp/yp.c
+++ b/ext/yp/yp.c
@@ -69,7 +69,7 @@ PHP_FUNCTION(yp_order) {
       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 @@ PHP_FUNCTION(yp_master) {
        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 @@ PHP_FUNCTION(yp_match) {
        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 @@ PHP_FUNCTION(yp_first) {
        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 @@ PHP_FUNCTION(yp_next) {
        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;
        }
 

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 95254ba16ea30067e237af55c0a737d725502adb..74d2ee3354b91c4b9900ded6c029018fdb5098a5 100644 (file)
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -287,12 +287,12 @@ PHP_FUNCTION(gzfile) {
        /* 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 @@ PHP_FUNCTION(gzopen) {
        
        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 @@ PHP_FUNCTION(gzclose) {
        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 @@ PHP_FUNCTION(gzeof) {
        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 @@ PHP_FUNCTION(gzgets) {
        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 @@ PHP_FUNCTION(gzgetc) {
        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 @@ PHP_FUNCTION(gzgetss)
        
        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 @@ PHP_FUNCTION(gzwrite) {
 
        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 @@ PHP_FUNCTION(gzrewind) {
        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 @@ PHP_FUNCTION(gztell) {
        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 @@ PHP_FUNCTION(gzseek) {
        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 @@ PHP_FUNCTION(readgzfile) {
        /* 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 @@ PHP_FUNCTION(gzpassthru) {
        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 @@ PHP_FUNCTION(gzread)
        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);