merge trunk

1 files changed, 7 insertions, 33 deletions

diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 02cea82..380bec1 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -1536,7 +1536,7 @@ AppendUtfToUtfRep(
 /*
  *----------------------------------------------------------------------
  *
- * Tcl_AppendStringsToObjVA --
+ * Tcl_AppendStringsToObj --
  *
  *	This function appends one or more null-terminated strings to an
  *	object.
@@ -1552,10 +1552,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");
     }
@@ -1568,35 +1571,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);
 }