From: Andrei Zmievski <andrei@php.net>
Date: Sun, 12 Aug 2001 02:45:41 +0000 (+0000)
Subject: Fix it up a bit.
X-Git-Tag: BEFORE_EXP_MERGE~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75da34e8aa4ac9720e5c3e21b2ef3f760fdb2f2c;p=php

Fix it up a bit.
---

diff --git a/ext/skeleton/create_stubs b/ext/skeleton/create_stubs
index ad9bc81ab0..4ce740859f 100755
--- a/ext/skeleton/create_stubs
+++ b/ext/skeleton/create_stubs
@@ -114,21 +114,18 @@ BEGIN {
 				argnames[num_funcs,args_max] = arg_name
 
 				args_max++
-				spec_str = spec_str spec_map[arg_type]
 				if (optional) {
-					optionals[num_funcs,i] = optional
-					if (arg_type != "resource") {
-						useswitch[num_funcs] = 1
+					if (!spec_opt) {
+						spec_str = spec_str "|"
+						spec_opt = 1
 					}
+					optionals[num_funcs,i] = optional
 				} else {
-						args_min++
+					args_min++
 				}
+				spec_str = spec_str spec_map[arg_type]
 
 				if (x = gobble("\\[")) {
-					if (!spec_opt) {
-						spec_str = spec_str "|"
-						spec_opt = 1
-					}
 					optional++
 				}
 
@@ -180,13 +177,17 @@ END {
 			"     <funcprototype>\n" \
 			"      <funcdef>" types[i] " <function>" funcs[i] "</function></funcdef>\n"
 
-		fetchargs = "\tif (zend_parse_parameters(ZEND_NUM_ARGS(), " specs[i] ", "
+		fetchargs = "\tif (zend_parse_parameters("
+		if (spec_opt) {
+			ints = ints "\tint argc = ZEND_NUM_ARGS();\n"
+			fetchargs = fetchargs "argc"
+		} else
+			fetchargs = fetchargs "ZEND_NUM_ARGS()"
+		fetchargs = fetchargs ", " specs[i]
 
 		for (j = 0; j < maxargs[i]; j++) {
 
-			if (j) {
-				fetchargs = fetchargs ", "
-			}
+			fetchargs = fetchargs ", "
 
 			fetchargs = fetchargs "&" argnames[i,j]
 			if (argtypes[i,j] == "string") {