revert 12657 - incorrect changes made

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12658 626c5289-ae23-0410-ae9c-e8d60b6d4f22

CHANGES.current

@@ -4,11 +4,6 @@ See the RELEASENOTES file for a summary of changes in each release.
 
 Version 2.0.4 (in progress)
 ===========================
-2011-05-05: wsfulton
-            Fix %varargs when used with a numerical argument, eg %varargs(3, char *arg = NULL).
-            It was possible to use one extra optional argument than document. Now the above only
-            generates 3 optional char * arguments. Reported by Karl Wette.
-
 2011-05-05: wsfulton
             [Lua, Python, Tcl] C/C++ prototypes shown in error message when calling an overloaded
             method with incorrect arguments improved to show always show fully qualified name

Examples/test-suite/python/varargs_runme.py

@@ -27,8 +27,11 @@ if varargs.test_plenty("Hello", 1) != "Hello":
 if varargs.test_plenty("Hello", 1, 2) != "Hello":
     raise RuntimeError, "Failed"
 
+if varargs.test_plenty("Hello", 1, 2, 3) != "Hello":
+    raise RuntimeError, "Failed"
+
 try:
-    varargs.test_plenty("Hello", 1, 2, 3)
+    varargs.test_plenty("Hello", 1, 2, 3, 4)
     raise RuntimeError
 except NotImplementedError:
     pass

Source/CParse/parser.y

@@ -2628,7 +2628,8 @@ varargs_parms   : parms { $$ = $1; }
 		    $$ = 0;
 		  } else {
 		    $$ = Copy($3);
-		    for (i = 0; i < n-1; i++) {
+		    Setattr($$,"name","VARARGS_SENTINEL");
+		    for (i = 0; i < n; i++) {
 		      p = Copy($3);
 		      set_nextSibling(p,$$);
 		      Delete($$);