jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

There's no need to call zend_get_parameters_array_ex() when no parameters

Browse source 
have been passed.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@9114 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Olly Betts 2006-05-14 19:58:34 +00:00
commit 69d8eda7f8
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Source/Modules/php4.cxx
View file

@ -1031,19 +1031,18 @@ public:
if(numopt > 0) { // membervariable wrappers do not have optional args
Wrapper_add_local(f, "arg_count", "int arg_count");
Printf(f->code,"arg_count = ZEND_NUM_ARGS();\n");
Printf(f->code,"if(arg_count<%d || arg_count>%d)\n",num_required, num_arguments);
Printf(f->code,"if(arg_count<%d || arg_count>%d ||\n",num_required, num_arguments);
Printf(f->code," zend_get_parameters_array_ex(arg_count,args)!=SUCCESS)\n");
Printf(f->code,"\tWRONG_PARAM_COUNT;\n\n");
/* Verified args, retrieve them... */
Printf(f->code,"if(zend_get_parameters_array_ex(arg_count,args)!=SUCCESS)\n");
Printf(f->code,"\t\tWRONG_PARAM_COUNT;\n\n");
} else if (!mvr) {
Printf(f->code, "if(((ZEND_NUM_ARGS() )!= %d) || (zend_get_parameters_array_ex(%d, args)",
num_arguments-has_this_ptr, num_arguments-has_this_ptr);
Printf(f->code, "!= SUCCESS)) {\n");
Printf(f->code, "WRONG_PARAM_COUNT;\n}\n\n");
int num = num_arguments - has_this_ptr;
if (num == 0) {
Printf(f->code, "if(ZEND_NUM_ARGS() != 0) {\n");
} else {
Printf(f->code, "if(ZEND_NUM_ARGS() != %d || zend_get_parameters_array_ex(%d, args) != SUCCESS) {\n",
num, num);
}
Printf(f->code, "WRONG_PARAM_COUNT;\n}\n\n");
}
/* Now convert from php to C variables */