Remove all VA functions Tcl_AppendResultVA, Tcl_AppendStringsToObjVA, Tcl_SetErrorCodeVA, Tcl_PanicVA, and dependancy of tcl.h on <stdarg.h>. TIP required.

8 files changed, 77 insertions, 193 deletions

diff --git a/generic/tcl.decls b/generic/tcl.decls
index fe1d763..e9ab7c0 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -949,12 +949,14 @@ declare 265 {
 declare 266 {
     void Tcl_ValidateAllMemory(const char *file, int line)
 }
-declare 267 {
-    void Tcl_AppendResultVA(Tcl_Interp *interp, va_list argList)
-}
-declare 268 {
-    void Tcl_AppendStringsToObjVA(Tcl_Obj *objPtr, va_list argList)
-}
+# Removed in 9.0
+#declare 267 {
+#    void Tcl_AppendResultVA(Tcl_Interp *interp, va_list argList)
+#}
+# Removed in 9.0
+#declare 268 {
+#    void Tcl_AppendStringsToObjVA(Tcl_Obj *objPtr, va_list argList)
+#}
 declare 269 {
     char *Tcl_HashStats(Tcl_HashTable *tablePtr)
 }
@@ -981,9 +983,10 @@ declare 274 {
     const char *Tcl_PkgRequire(Tcl_Interp *interp, const char *name,
 	    const char *version, int exact)
 }
-declare 275 {
-    void Tcl_SetErrorCodeVA(Tcl_Interp *interp, va_list argList)
-}
+# Removed in 9.0
+#declare 275 {
+#    void Tcl_SetErrorCodeVA(Tcl_Interp *interp, va_list argList)
+#}
 # Removed in 9.0
 #declare 276 {
 #    int  Tcl_VarEvalVA(Tcl_Interp *interp, va_list argList)
@@ -991,9 +994,10 @@ declare 275 {
 declare 277 {
     Tcl_Pid Tcl_WaitPid(Tcl_Pid pid, int *statPtr, int options)
 }
-declare 278 {
-    void Tcl_PanicVA(const char *format, va_list argList)
-}
+# Removed in 9.0
+#declare 278 {
+#    void Tcl_PanicVA(const char *format, va_list argList)
+#}
 declare 279 {
     void Tcl_GetVersion(int *major, int *minor, int *patchLevel, int *type)
 }
diff --git a/generic/tcl.h b/generic/tcl.h
index 09191df..98736ea 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -123,18 +123,6 @@ extern "C" {
 
 #include <stdio.h>
 
-/*
- *----------------------------------------------------------------------------
- * Support for functions with a variable number of arguments.
- *
- * The following TCL_VARARGS* macros are to support old extensions
- * written for older versions of Tcl where the macros permitted
- * support for the varargs.h system as well as stdarg.h .
- *
- * New code should just directly be written to use stdarg.h conventions.
- */
-
-#include <stdarg.h>
 #if defined(__GNUC__) && (__GNUC__ > 2)
 #   define TCL_FORMAT_PRINTF(a,b) __attribute__ ((__format__ (__printf__, a, b)))
 #else
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 0770e98..6d6a03c 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -767,12 +767,8 @@ TCLAPI void		Tcl_WrongNumArgs(Tcl_Interp *interp, int objc,
 TCLAPI int		Tcl_DumpActiveMemory(const char *fileName);
 /* 266 */
 TCLAPI void		Tcl_ValidateAllMemory(const char *file, int line);
-/* 267 */
-TCLAPI void		Tcl_AppendResultVA(Tcl_Interp *interp,
-				va_list argList);
-/* 268 */
-TCLAPI void		Tcl_AppendStringsToObjVA(Tcl_Obj *objPtr,
-				va_list argList);
+/* Slot 267 is reserved */
+/* Slot 268 is reserved */
 /* 269 */
 TCLAPI char *		Tcl_HashStats(Tcl_HashTable *tablePtr);
 /* 270 */
@@ -791,14 +787,11 @@ TCLAPI int		TclPkgProvide(Tcl_Interp *interp, const char *name,
 /* 274 */
 TCLAPI const char *	Tcl_PkgRequire(Tcl_Interp *interp, const char *name,
 				const char *version, int exact);
-/* 275 */
-TCLAPI void		Tcl_SetErrorCodeVA(Tcl_Interp *interp,
-				va_list argList);
+/* Slot 275 is reserved */
 /* Slot 276 is reserved */
 /* 277 */
 TCLAPI Tcl_Pid		Tcl_WaitPid(Tcl_Pid pid, int *statPtr, int options);
-/* 278 */
-TCLAPI void		Tcl_PanicVA(const char *format, va_list argList);
+/* Slot 278 is reserved */
 /* 279 */
 TCLAPI void		Tcl_GetVersion(int *major, int *minor,
 				int *patchLevel, int *type);
@@ -2068,18 +2061,18 @@ typedef struct TclStubs {
     void (*tcl_WrongNumArgs) (Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], const char *message); /* 264 */
     int (*tcl_DumpActiveMemory) (const char *fileName); /* 265 */
     void (*tcl_ValidateAllMemory) (const char *file, int line); /* 266 */
-    void (*tcl_AppendResultVA) (Tcl_Interp *interp, va_list argList); /* 267 */
-    void (*tcl_AppendStringsToObjVA) (Tcl_Obj *objPtr, va_list argList); /* 268 */
+    void (*reserved267)(void);
+    void (*reserved268)(void);
     char * (*tcl_HashStats) (Tcl_HashTable *tablePtr); /* 269 */
     const char * (*tcl_ParseVar) (Tcl_Interp *interp, const char *start, const char **termPtr); /* 270 */
     const char * (*tcl_PkgPresent) (Tcl_Interp *interp, const char *name, const char *version, int exact); /* 271 */
     const char * (*tcl_PkgPresentEx) (Tcl_Interp *interp, const char *name, const char *version, int exact, void *clientDataPtr); /* 272 */
     int (*tclPkgProvide) (Tcl_Interp *interp, const char *name, const char *version); /* 273 */
     const char * (*tcl_PkgRequire) (Tcl_Interp *interp, const char *name, const char *version, int exact); /* 274 */
-    void (*tcl_SetErrorCodeVA) (Tcl_Interp *interp, va_list argList); /* 275 */
+    void (*reserved275)(void);
     void (*reserved276)(void);
     Tcl_Pid (*tcl_WaitPid) (Tcl_Pid pid, int *statPtr, int options); /* 277 */
-    void (*tcl_PanicVA) (const char *format, va_list argList); /* 278 */
+    void (*reserved278)(void);
     void (*tcl_GetVersion) (int *major, int *minor, int *patchLevel, int *type); /* 279 */
     void (*tcl_InitMemory) (Tcl_Interp *interp); /* 280 */
     Tcl_Channel (*tcl_StackChannel) (Tcl_Interp *interp, const Tcl_ChannelType *typePtr, ClientData instanceData, int mask, Tcl_Channel prevChan); /* 281 */
@@ -2990,10 +2983,8 @@ extern const TclStubs *tclStubsPtr;
 	(tclStubsPtr->tcl_DumpActiveMemory) /* 265 */
 #define Tcl_ValidateAllMemory \
 	(tclStubsPtr->tcl_ValidateAllMemory) /* 266 */
-#define Tcl_AppendResultVA \
-	(tclStubsPtr->tcl_AppendResultVA) /* 267 */
-#define Tcl_AppendStringsToObjVA \
-	(tclStubsPtr->tcl_AppendStringsToObjVA) /* 268 */
+/* Slot 267 is reserved */
+/* Slot 268 is reserved */
 #define Tcl_HashStats \
 	(tclStubsPtr->tcl_HashStats) /* 269 */
 #define Tcl_ParseVar \
@@ -3006,13 +2997,11 @@ extern const TclStubs *tclStubsPtr;
 	(tclStubsPtr->tclPkgProvide) /* 273 */
 #define Tcl_PkgRequire \
 	(tclStubsPtr->tcl_PkgRequire) /* 274 */
-#define Tcl_SetErrorCodeVA \
-	(tclStubsPtr->tcl_SetErrorCodeVA) /* 275 */
+/* Slot 275 is reserved */
 /* Slot 276 is reserved */
 #define Tcl_WaitPid \
 	(tclStubsPtr->tcl_WaitPid) /* 277 */
-#define Tcl_PanicVA \
-	(tclStubsPtr->tcl_PanicVA) /* 278 */
+/* Slot 278 is reserved */
 #define Tcl_GetVersion \
 	(tclStubsPtr->tcl_GetVersion) /* 279 */
 #define Tcl_InitMemory \
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 742d957..8a78b94 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -40,6 +40,7 @@
 #include <stdio.h>
 
 #include <ctype.h>
+#include <stdarg.h>
 #ifdef NO_STDLIB_H
 #   include "../compat/stdlib.h"
 #else
diff --git a/generic/tclPanic.c b/generic/tclPanic.c
index b87a8df..3dd7649 100644
--- a/generic/tclPanic.c
+++ b/generic/tclPanic.c
@@ -59,7 +59,7 @@ Tcl_SetPanicProc(
 /*
  *----------------------------------------------------------------------
  *
- * Tcl_PanicVA --
+ * Tcl_Panic --
  *
  *	Print an error message and kill the process.
  *
@@ -72,16 +72,19 @@ Tcl_SetPanicProc(
  *----------------------------------------------------------------------
  */
 
+	/* ARGSUSED */
 void
-Tcl_PanicVA(
-    const char *format,		/* Format string, suitable for passing to
-				 * fprintf. */
-    va_list argList)		/* Variable argument list. */
+Tcl_Panic(
+    const char *format,
+    ...)
 {
+    va_list argList;
     char *arg1, *arg2, *arg3;	/* Additional arguments (variable in number)
 				 * to pass to fprintf. */
     char *arg4, *arg5, *arg6, *arg7, *arg8;
 
+
+    va_start(argList, format);
     arg1 = va_arg(argList, char *);
     arg2 = va_arg(argList, char *);
     arg3 = va_arg(argList, char *);
@@ -90,6 +93,7 @@ Tcl_PanicVA(
     arg6 = va_arg(argList, char *);
     arg7 = va_arg(argList, char *);
     arg8 = va_arg(argList, char *);
+    va_end (argList);
 
     if (panicProc != NULL) {
 	panicProc(format, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
@@ -122,35 +126,6 @@ Tcl_PanicVA(
 }
 
 /*
- *----------------------------------------------------------------------
- *
- * Tcl_Panic --
- *
- *	Print an error message and kill the process.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The process dies, entering the debugger if possible.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-void
-Tcl_Panic(
-    const char *format,
-    ...)
-{
-    va_list argList;
-
-    va_start(argList, format);
-    Tcl_PanicVA(format, argList);
-    va_end (argList);
-}
-
-/*
  * Local Variables:
  * mode: c
  * c-basic-offset: 4
diff --git a/generic/tclResult.c b/generic/tclResult.c
index 618b7d8..ad45c41 100644
--- a/generic/tclResult.c
+++ b/generic/tclResult.c
@@ -444,41 +444,6 @@ Tcl_GetObjResult(
 /*
  *----------------------------------------------------------------------
  *
- * Tcl_AppendResultVA --
- *
- *	Append a variable number of strings onto the interpreter's result.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The result of the interpreter given by the first argument is extended
- *	by the strings in the va_list (up to a terminating NULL argument).
- *
- *	If the string result is non-empty, the object result forced to be a
- *	duplicate of it first. There will be a string result afterwards.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_AppendResultVA(
-    Tcl_Interp *interp,		/* Interpreter with which to associate the
-				 * return value. */
-    va_list argList)		/* Variable argument list. */
-{
-    Tcl_Obj *objPtr = Tcl_GetObjResult(interp);
-
-    if (Tcl_IsShared(objPtr)) {
-	objPtr = Tcl_DuplicateObj(objPtr);
-    }
-    Tcl_AppendStringsToObjVA(objPtr, argList);
-    Tcl_SetObjResult(interp, objPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
  * Tcl_AppendResult --
  *
  *	Append a variable number of strings onto the interpreter's result.
@@ -502,9 +467,23 @@ Tcl_AppendResult(
     Tcl_Interp *interp, ...)
 {
     va_list argList;
+    Tcl_Obj *objPtr;
 
     va_start(argList, interp);
-    Tcl_AppendResultVA(interp, argList);
+    objPtr = Tcl_GetObjResult(interp);
+
+    if (Tcl_IsShared(objPtr)) {
+	objPtr = Tcl_DuplicateObj(objPtr);
+    }
+    while (1) {
+	const char *bytes = va_arg(argList, char *);
+
+	if (bytes == NULL) {
+	    break;
+	}
+	Tcl_AppendToObj(objPtr, bytes, -1);
+    }
+    Tcl_SetObjResult(interp, objPtr);
     va_end(argList);
 }
 
@@ -684,7 +663,7 @@ ResetObjResult(
 /*
  *----------------------------------------------------------------------
  *
- * Tcl_SetErrorCodeVA --
+ * Tcl_SetErrorCode --
  *
  *	This function is called to record machine-readable information about
  *	an error that is about to be returned.
@@ -701,11 +680,19 @@ ResetObjResult(
  */
 
 void
-Tcl_SetErrorCodeVA(
-    Tcl_Interp *interp,		/* Interpreter in which to set errorCode */
-    va_list argList)		/* Variable argument list. */
+Tcl_SetErrorCode(
+    Tcl_Interp *interp, ...)
 {
-    Tcl_Obj *errorObj = Tcl_NewObj();
+    va_list argList;
+    Tcl_Obj *errorObj;
+
+    /*
+     * Scan through the arguments one at a time, appending them to the
+     * errorCode field as list elements.
+     */
+
+    va_start(argList, interp);
+    errorObj = Tcl_NewObj();
 
     /*
      * Scan through the arguments one at a time, appending them to the
@@ -721,40 +708,6 @@ Tcl_SetErrorCodeVA(
 	Tcl_ListObjAppendElement(NULL, errorObj, Tcl_NewStringObj(elem, -1));
     }
     Tcl_SetObjErrorCode(interp, errorObj);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetErrorCode --
- *
- *	This function is called to record machine-readable information about
- *	an error that is about to be returned.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The errorCode field of the interp is modified to hold all of the
- *	arguments to this function, in a list form with each argument becoming
- *	one element of the list.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SetErrorCode(
-    Tcl_Interp *interp, ...)
-{
-    va_list argList;
-
-    /*
-     * Scan through the arguments one at a time, appending them to the
-     * errorCode field as list elements.
-     */
-
-    va_start(argList, interp);
-    Tcl_SetErrorCodeVA(interp, argList);
     va_end(argList);
 }
 
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 04cf4ee..b38f521 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -1613,7 +1613,7 @@ AppendUtfToUtfRep(
 /*
  *----------------------------------------------------------------------
  *
- * Tcl_AppendStringsToObjVA --
+ * Tcl_AppendStringsToObj --
  *
  *	This function appends one or more null-terminated strings to an
  *	object.
@@ -1629,10 +1629,13 @@ AppendUtfToUtfRep(
  */
 
 void
-Tcl_AppendStringsToObjVA(
-    Tcl_Obj *objPtr,		/* Points to the object to append to. */
-    va_list argList)		/* Variable argument list. */
+Tcl_AppendStringsToObj(
+    Tcl_Obj *objPtr,
+    ...)
 {
+    va_list argList;
+
+    va_start(argList, objPtr);
     if (Tcl_IsShared(objPtr)) {
 	Tcl_Panic("%s called with shared object", "Tcl_AppendStringsToObj");
     }
@@ -1645,35 +1648,6 @@ Tcl_AppendStringsToObjVA(
 	}
 	Tcl_AppendToObj(objPtr, bytes, -1);
     }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AppendStringsToObj --
- *
- *	This function appends one or more null-terminated strings to an
- *	object.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The contents of all the string arguments are appended to the string
- *	representation of objPtr.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_AppendStringsToObj(
-    Tcl_Obj *objPtr,
-    ...)
-{
-    va_list argList;
-
-    va_start(argList, objPtr);
-    Tcl_AppendStringsToObjVA(objPtr, argList);
     va_end(argList);
 }
 
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 50fc6de..39d1262 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -937,18 +937,18 @@ const TclStubs tclStubs = {
     Tcl_WrongNumArgs, /* 264 */
     Tcl_DumpActiveMemory, /* 265 */
     Tcl_ValidateAllMemory, /* 266 */
-    Tcl_AppendResultVA, /* 267 */
-    Tcl_AppendStringsToObjVA, /* 268 */
+    0, /* 267 */
+    0, /* 268 */
     Tcl_HashStats, /* 269 */
     Tcl_ParseVar, /* 270 */
     Tcl_PkgPresent, /* 271 */
     Tcl_PkgPresentEx, /* 272 */
     TclPkgProvide, /* 273 */
     Tcl_PkgRequire, /* 274 */
-    Tcl_SetErrorCodeVA, /* 275 */
+    0, /* 275 */
     0, /* 276 */
     Tcl_WaitPid, /* 277 */
-    Tcl_PanicVA, /* 278 */
+    0, /* 278 */
     Tcl_GetVersion, /* 279 */
     Tcl_InitMemory, /* 280 */
     Tcl_StackChannel, /* 281 */