cvs: /php4/ext/bcmath bcmath.c /php4/ext/db db.c /php4/ext/gd gdt1.c /php4/ext/standard basic_functions.c dns.c file.c

andrei Mon Dec 20 12:35:26 1999 EDT Modified files: /php4/ext/bcmath bcmath.c /php4/ext/db db.c /php4/ext/gd gdt1.c /php4/ext/standard basic_functions.c dns.c file.c Log: getParameters -> zend_get_parameters Index: php4/ext/bcmath/bcmath.c diff -u php4/ext/bcmath/bcmath.c:1.11 php4/ext/bcmath/bcmath.c:1.12 --- php4/ext/bcmath/bcmath.c:1.11 Fri Dec 17 15:54:46 1999 +++ php4/ext/bcmath/bcmath.c Mon Dec 20 12:34:52 1999 @@ -73,12 +73,12 @@ switch (ARG_COUNT(ht)) { case 2: - if (getParameters(ht, 2, &left, &right) == FAILURE) { + if (zend_get_parameters(ht, 2, &left, &right) == FAILURE) { WRONG_PARAM_COUNT; } break; case 3: - if (getParameters(ht, 3, &left, &right, &scale_param) == FAILURE) { + if (zend_get_parameters(ht, 3, &left, &right, &scale_param) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long(scale_param); @@ -116,12 +116,12 @@ switch (ARG_COUNT(ht)) { case 2: - if (getParameters(ht, 2, &left, &right) == FAILURE) { + if (zend_get_parameters(ht, 2, &left, &right) == FAILURE) { WRONG_PARAM_COUNT; } break; case 3: - if (getParameters(ht, 3, &left, &right, &scale_param) == FAILURE) { + if (zend_get_parameters(ht, 3, &left, &right, &scale_param) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long(scale_param); @@ -159,12 +159,12 @@ switch (ARG_COUNT(ht)) { case 2: - if (getParameters(ht, 2, &left, &right) == FAILURE) { + if (zend_get_parameters(ht, 2, &left, &right) == FAILURE) { WRONG_PARAM_COUNT; } break; case 3: - if (getParameters(ht, 3, &left, &right, &scale_param) == FAILURE) { + if (zend_get_parameters(ht, 3, &left, &right, &scale_param) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long(scale_param); @@ -202,12 +202,12 @@ switch (ARG_COUNT(ht)) { case 2: - if (getParameters(ht, 2, &left, &right) == FAILURE) { + if (zend_get_parameters(ht, 2, &left, &right) == FAILURE) { WRONG_PARAM_COUNT; } break; case 3: - if (getParameters(ht, 3, &left, &right, &scale_param) == FAILURE) { + if (zend_get_parameters(ht, 3, &left, &right, &scale_param) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long(scale_param); @@ -250,7 +250,7 @@ switch (ARG_COUNT(ht)) { case 2: - if (getParameters(ht, 2, &left, &right) == FAILURE) { + if (zend_get_parameters(ht, 2, &left, &right) == FAILURE) { WRONG_PARAM_COUNT; } break; @@ -292,12 +292,12 @@ switch (ARG_COUNT(ht)) { case 2: - if (getParameters(ht, 2, &left, &right) == FAILURE) { + if (zend_get_parameters(ht, 2, &left, &right) == FAILURE) { WRONG_PARAM_COUNT; } break; case 3: - if (getParameters(ht, 3, &left, &right, &scale_param) == FAILURE) { + if (zend_get_parameters(ht, 3, &left, &right, &scale_param) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long(scale_param); @@ -335,12 +335,12 @@ switch (ARG_COUNT(ht)) { case 1: - if (getParameters(ht, 1, &left) == FAILURE) { + if (zend_get_parameters(ht, 1, &left) == FAILURE) { WRONG_PARAM_COUNT; } break; case 2: - if (getParameters(ht, 2, &left, &scale_param) == FAILURE) { + if (zend_get_parameters(ht, 2, &left, &scale_param) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long(scale_param); @@ -375,12 +375,12 @@ switch (ARG_COUNT(ht)) { case 2: - if (getParameters(ht, 2, &left, &right) == FAILURE) { + if (zend_get_parameters(ht, 2, &left, &right) == FAILURE) { WRONG_PARAM_COUNT; } break; case 3: - if (getParameters(ht, 3, &left, &right, &scale_param) == FAILURE) { + if (zend_get_parameters(ht, 3, &left, &right, &scale_param) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long(scale_param); @@ -413,7 +413,7 @@ { pval *new_scale; - if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &new_scale)==FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters(ht, 1, &new_scale)==FAILURE) { WRONG_PARAM_COUNT; } Index: php4/ext/db/db.c diff -u php4/ext/db/db.c:1.18 php4/ext/db/db.c:1.19 --- php4/ext/db/db.c:1.18 Sat Dec 18 12:05:21 1999 +++ php4/ext/db/db.c Mon Dec 20 12:34:53 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.18 1999/12/18 17:05:21 andrei Exp $ */ +/* $Id: db.c,v 1.19 1999/12/20 17:34:53 andrei Exp $ */ #define IS_EXT_MODULE #if COMPILE_DL # include "dl/phpdl.h" @@ -256,7 +256,7 @@ int ret; DBM_TLS_VARS; - if (ARG_COUNT(ht)!=2 || getParameters(ht,2,&filename,&mode)==FAILURE) { + if (ARG_COUNT(ht)!=2 || zend_get_parameters(ht,2,&filename,&mode)==FAILURE) { WRONG_PARAM_COUNT; } @@ -412,7 +412,7 @@ PHP_FUNCTION(dbmclose) { pval *id; - if (ARG_COUNT(ht) != 1 || getParameters(ht,1,&id)==FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters(ht,1,&id)==FAILURE) { WRONG_PARAM_COUNT; } convert_to_long(id); @@ -463,7 +463,7 @@ dbm_info *info; int ret; - if (ARG_COUNT(ht)!=3||getParameters(ht,3,&id,&key,&value) == FAILURE) { + if (ARG_COUNT(ht)!=3||zend_get_parameters(ht,3,&id,&key,&value) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string(key); @@ -516,7 +516,7 @@ dbm_info *info; int ret; - if (ARG_COUNT(ht)!=3||getParameters(ht,3,&id,&key,&value) == FAILURE) { + if (ARG_COUNT(ht)!=3||zend_get_parameters(ht,3,&id,&key,&value) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string(key); @@ -571,7 +571,7 @@ pval *id, *key; dbm_info *info; - if (ARG_COUNT(ht)!=2||getParameters(ht,2,&id,&key)==FAILURE) { + if (ARG_COUNT(ht)!=2||zend_get_parameters(ht,2,&id,&key)==FAILURE) { WRONG_PARAM_COUNT; } convert_to_string(key); @@ -643,7 +643,7 @@ dbm_info *info; int ret; - if (ARG_COUNT(ht)!=2||getParameters(ht,2,&id,&key)==FAILURE) { + if (ARG_COUNT(ht)!=2||zend_get_parameters(ht,2,&id,&key)==FAILURE) { WRONG_PARAM_COUNT; } convert_to_string(key); @@ -686,7 +686,7 @@ dbm_info *info; int ret; - if (ARG_COUNT(ht)!=2||getParameters(ht,2,&id,&key)==FAILURE) { + if (ARG_COUNT(ht)!=2||zend_get_parameters(ht,2,&id,&key)==FAILURE) { WRONG_PARAM_COUNT; } convert_to_string(key); @@ -728,7 +728,7 @@ dbm_info *info; char *ret; - if (ARG_COUNT(ht)!=1||getParameters(ht,1,&id)==FAILURE) { + if (ARG_COUNT(ht)!=1||zend_get_parameters(ht,1,&id)==FAILURE) { WRONG_PARAM_COUNT; } @@ -785,7 +785,7 @@ dbm_info *info; char *ret; - if (ARG_COUNT(ht)!=2||getParameters(ht,2,&id,&key)==FAILURE) { + if (ARG_COUNT(ht)!=2||zend_get_parameters(ht,2,&id,&key)==FAILURE) { WRONG_PARAM_COUNT; } convert_to_string(key); Index: php4/ext/gd/gdt1.c diff -u php4/ext/gd/gdt1.c:1.4 php4/ext/gd/gdt1.c:1.5 --- php4/ext/gd/gdt1.c:1.4 Fri Dec 17 16:50:02 1999 +++ php4/ext/gd/gdt1.c Mon Dec 20 12:34:53 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gdt1.c,v 1.4 1999/12/17 21:50:02 zeev Exp $ */ +/* $Id: gdt1.c,v 1.5 1999/12/20 17:34:53 andrei Exp $ */ void php_free_ps_font(gd_ps_font *f_ind) { @@ -38,7 +38,7 @@ int l_ind; gd_ps_font *f_ind; - if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &file) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters(ht, 1, &file) == FAILURE) { WRONG_PARAM_COUNT; } @@ -84,7 +84,7 @@ int l_ind, type; gd_ps_font *nf_ind, *of_ind; - if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &fnt) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters(ht, 1, &fnt) == FAILURE) { WRONG_PARAM_COUNT; } @@ -137,7 +137,7 @@ pval *fnt; int type; - if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &fnt) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters(ht, 1, &fnt) == FAILURE) { WRONG_PARAM_COUNT; } @@ -164,7 +164,7 @@ int type; gd_ps_font *f_ind; - if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &fnt, &enc) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters(ht, 2, &fnt, &enc) == FAILURE) { WRONG_PARAM_COUNT; } @@ -202,7 +202,7 @@ int type; gd_ps_font *f_ind; - if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &fnt, &ext) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters(ht, 2, &fnt, &ext) == FAILURE) { WRONG_PARAM_COUNT; } @@ -230,7 +230,7 @@ int type; gd_ps_font*f_ind; - if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &fnt, &slt) == FAILURE) { + if (ARG_COUNT(ht) != 2 || zend_get_parameters(ht, 2, &fnt, &slt) == FAILURE) { WRONG_PARAM_COUNT; } @@ -272,7 +272,7 @@ switch(ARG_COUNT(ht)) { case 8: - if (getParameters(ht, 8, &img, &str, &fnt, &sz, &fg, &bg, &px, &py) == FAILURE) { + if (zend_get_parameters(ht, 8, &img, &str, &fnt, &sz, &fg, &bg, &px, &py) == FAILURE) { RETURN_FALSE; } convert_to_string(str); @@ -290,7 +290,7 @@ angle = 0; break; case 12: - if (getParameters(ht, 12, &img, &str, &fnt, &sz, &fg, &bg, &px, &py, &sp, &wd, &ang, &aas) == FAILURE) { + if (zend_get_parameters(ht, 12, &img, &str, &fnt, &sz, &fg, &bg, &px, &py, &sp, &wd, &ang, &aas) == FAILURE) { RETURN_FALSE; } convert_to_string(str); @@ -433,7 +433,7 @@ switch(ARG_COUNT(ht)) { case 3: - if (getParameters(ht, 3, &str, &fnt, &sz) == FAILURE) { + if (zend_get_parameters(ht, 3, &str, &fnt, &sz) == FAILURE) { RETURN_FALSE; } convert_to_string(str); @@ -442,7 +442,7 @@ space = 0; break; case 6: - if (getParameters(ht, 6, &str, &fnt, &sz, &sp, &wd, &ang) == FAILURE) { + if (zend_get_parameters(ht, 6, &str, &fnt, &sz, &sp, &wd, &ang) == FAILURE) { RETURN_FALSE; } convert_to_string(str); Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.143 php4/ext/standard/basic_functions.c:1.144 --- php4/ext/standard/basic_functions.c:1.143 Sun Dec 19 13:58:27 1999 +++ php4/ext/standard/basic_functions.c Mon Dec 20 12:34:54 1999 @@ -1044,7 +1044,7 @@ } shutdown_function_entry.arguments = (pval **) emalloc(sizeof(pval *)*shutdown_function_entry.arg_count); - if (getParametersArray(ht, shutdown_function_entry.arg_count, shutdown_function_entry.arguments)==FAILURE) { + if (zend_get_parameters_array(ht, shutdown_function_entry.arg_count, shutdown_function_entry.arguments)==FAILURE) { RETURN_FALSE; } convert_to_string(shutdown_function_entry.arguments[0]); Index: php4/ext/standard/dns.c diff -u php4/ext/standard/dns.c:1.10 php4/ext/standard/dns.c:1.11 --- php4/ext/standard/dns.c:1.10 Sat Dec 18 17:35:27 1999 +++ php4/ext/standard/dns.c Mon Dec 20 12:34:55 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dns.c,v 1.10 1999/12/18 22:35:27 zeev Exp $ */ +/* $Id: dns.c,v 1.11 1999/12/20 17:34:55 andrei Exp $ */ #include "php.h" #if HAVE_SYS_SOCKET_H @@ -236,7 +236,7 @@ switch(ARG_COUNT(ht)) { case 2: - if (getParameters(ht, 2, &host, &mx_list) == FAILURE) { + if (zend_get_parameters(ht, 2, &host, &mx_list) == FAILURE) { WRONG_PARAM_COUNT; } if (!ParameterPassedByReference(ht, 2)) { @@ -245,7 +245,7 @@ } break; case 3: - if (getParameters(ht, 3, &host, &mx_list, &weight_list) == FAILURE) { + if (zend_get_parameters(ht, 3, &host, &mx_list, &weight_list) == FAILURE) { WRONG_PARAM_COUNT; } if (!ParameterPassedByReference(ht, 2) || !ParameterPassedByReference(ht, 3)) { Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.52 php4/ext/standard/file.c:1.53 --- php4/ext/standard/file.c:1.52 Sat Dec 18 17:35:27 1999 +++ php4/ext/standard/file.c Mon Dec 20 12:34:55 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.52 1999/12/18 22:35:27 zeev Exp $ */ +/* $Id: file.c,v 1.53 1999/12/20 17:34:55 andrei Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -882,7 +882,7 @@ int type, *sock; struct timeval t; - if (ARG_COUNT(ht)!=2 || getParameters(ht, 2, &socket, &timeout)==FAILURE) { + if (ARG_COUNT(ht)!=2 || zend_get_parameters(ht, 2, &socket, &timeout)==FAILURE) { WRONG_PARAM_COUNT; } convert_to_long(socket);