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

Eliminate "int error;" declaration from generated PHP director support code

Browse source 
if it isn't used.  No change in behaviour, and the compiler will just optimise
away the unused variable, but it can cause an "unused variable" warning.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11776 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Olly Betts 2009-12-10 11:52:29 +00:00
commit bfb09161f7
1 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Source/Modules/php.cxx
View file

@ -2536,7 +2536,24 @@ done:
}
p = nextSibling(p);
}
Append(w->code, "int error;\n");
/* exception handling */
tm = Swig_typemap_lookup("director:except", n, "result", 0);
if (!tm) {
tm = Getattr(n, "feature:director:except");
if (tm)
tm = Copy(tm);
}
if ((tm) && Len(tm) && (Strcmp(tm, "1") != 0)) {
if (Replaceall(tm, "$error", "error")) {
/* Only declare error if it is used by the typemap. */
Append(w->code, "int error;\n");
}
} else {
Delete(tm);
tm = NULL;
}
if (!idx) {
Printf(w->code, "zval **args = NULL;\n", idx);
} else {
@ -2555,18 +2572,10 @@ done:
Append(w->code, "call_user_function(EG(function_table), (zval**)&swig_self, &funcname,\n");
Printf(w->code, " result, %d, args TSRMLS_CC);\n", idx);
/* exception handling */
tm = Swig_typemap_lookup("director:except", n, "result", 0);
if (!tm) {
tm = Getattr(n, "feature:director:except");
if (tm)
tm = Copy(tm);
}
if ((tm) && Len(tm) && (Strcmp(tm, "1") != 0)) {
Replaceall(tm, "$error", "error");
if (tm) {
Printv(w->code, Str(tm), "\n", NIL);
Delete(tm);
}
Delete(tm);
/* marshal return value from PHP to C/C++ type */