Permalink
Browse files

- The tree compiles again

  • Loading branch information...
1 parent f1fcb02 commit a1ad2872eebc17448b115a1817e95b63e3ad17e9 @zsuraski zsuraski committed Dec 18, 1999
Showing with 590 additions and 590 deletions.
  1. +2 −2 Zend/zend.h
  2. +2 −2 Zend/zend_API.h
  3. +4 −4 ext/apache/apache.c
  4. +4 −4 ext/aspell/aspell.c
  5. +4 −4 ext/cybercash/cybercash.c
  6. +4 −4 ext/dba/dba.c
  7. +6 −6 ext/ereg/ereg.c
  8. +12 −12 ext/fdf/fdf.c
  9. +5 −5 ext/gettext/gettext.c
  10. +32 −32 ext/hyperwave/hw.c
  11. +22 −22 ext/ldap/ldap.c
  12. +8 −8 ext/mcrypt/mcrypt.c
  13. +3 −3 ext/mhash/mhash.c
  14. +13 −13 ext/mssql/php_mssql.c
  15. +36 −36 ext/mysql/php_mysql.c
  16. +34 −34 ext/oci8/oci8.c
  17. +46 −46 ext/odbc/php_odbc.c
  18. +25 −25 ext/oracle/oracle.c
  19. +7 −7 ext/pcre/php_pcre.c
  20. +1 −1 ext/pdf/pdf.c
  21. +6 −6 ext/readline/readline.c
  22. +9 −9 ext/session/session.c
  23. +41 −41 ext/standard/array.c
  24. +2 −2 ext/standard/assert.c
  25. +2 −2 ext/standard/base64.c
  26. +32 −32 ext/standard/basic_functions.c
  27. +2 −2 ext/standard/crypt.c
  28. +3 −3 ext/standard/dir.c
  29. +1 −1 ext/standard/dl.c
  30. +5 −5 ext/standard/dns.c
  31. +38 −38 ext/standard/file.c
  32. +1 −1 ext/standard/formatted_print.c
  33. +2 −2 ext/standard/html.c
  34. +2 −2 ext/standard/image.c
  35. +2 −2 ext/standard/info.c
  36. +3 −3 ext/standard/iptc.c
  37. +5 −5 ext/standard/link.c
  38. +1 −1 ext/standard/mail.c
  39. +28 −28 ext/standard/math.c
  40. +1 −1 ext/standard/md5.c
  41. +2 −2 ext/standard/metaphone.c
  42. +1 −1 ext/standard/microtime.c
  43. +4 −4 ext/standard/rand.c
  44. +6 −6 ext/standard/reg.c
  45. +1 −1 ext/standard/soundex.c
  46. +47 −47 ext/standard/string.c
  47. +2 −2 ext/standard/syslog.c
  48. +1 −1 ext/standard/uniqid.c
  49. +5 −5 ext/standard/url.c
  50. +3 −3 ext/standard/var.c
  51. +4 −4 ext/sysvsem/sysvsem.c
  52. +6 −6 ext/sysvshm/sysvshm.c
  53. +6 −6 ext/wddx/wddx.c
  54. +22 −22 ext/xml/xml.c
  55. +5 −5 ext/yp/yp.c
  56. +19 −19 ext/zlib/zlib.c
View
4 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
View
4 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
View
8 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);
View
8 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);
View
8 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;
}
View
8 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;
}
View
12 ext/ereg/ereg.c
@@ -193,15 +193,15 @@ 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
to make use of the information */
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;
}
View
24 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;
}
View
10 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;
}
View
64 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);
View
44 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;
}
View
16 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;
View
6 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;
}
View
26 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;
}
View
72 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,15 +1316,15 @@ 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) {
result_type = MYSQL_BOTH;
}
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;
}
View
68 ext/oci8/oci8.c
@@ -2029,15 +2029,15 @@ 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);
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;
}
View
92 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;