1 files changed, 125 insertions, 264 deletions

diff --git a/generic/tclPkg.c b/generic/tclPkg.c
index 0759faa..52f33c3 100644
--- a/generic/tclPkg.c
+++ b/generic/tclPkg.c
@@ -17,10 +17,6 @@
 
 #include "tclInt.h"
 
-MODULE_SCOPE char *tclEmptyStringRep;
-
-char *tclEmptyStringRep = &tclEmptyString;
-
 /*
  * Each invocation of the "package ifneeded" command creates a structure of
  * the following type, which is used to load the package into the interpreter
@@ -36,17 +32,6 @@ typedef struct PkgAvail {
 				 * same package. */
 } PkgAvail;
 
-typedef struct PkgName {
-    struct PkgName *nextPtr;	/* Next in list of package names being initialized. */
-    char name[1];
-} PkgName;
-
-typedef struct PkgFiles {
-    PkgName *names;		/* Package names being initialized. Must be first field*/
-    Tcl_HashTable table;	/* Table which contains files for each package */
-} PkgFiles;
-
-
 /*
  * For each package that is known in any way to an interpreter, there is one
  * record of the following type. These records are stored in the
@@ -61,7 +46,7 @@ typedef struct Package {
 				 * exist in this interpreter yet. */
     PkgAvail *availPtr;		/* First in list of all available versions of
 				 * this package. */
-    const void *clientData;	/* Client data. */
+    ClientData clientData;	/* Client data. */
 } Package;
 
 /*
@@ -86,7 +71,7 @@ static void		AddRequirementsToDString(Tcl_DString *dstring,
 static Package *	FindPackage(Tcl_Interp *interp, const char *name);
 static const char *	PkgRequireCore(Tcl_Interp *interp, const char *name,
 			    int reqc, Tcl_Obj *const reqv[],
-			    void *clientDataPtr);
+			    ClientData *clientDataPtr);
 
 /*
  * Helper macros.
@@ -96,7 +81,7 @@ static const char *	PkgRequireCore(Tcl_Interp *interp, const char *name,
     ((v) = ckalloc(len), memcpy((v),(s),(len)))
 #define DupString(v,s) \
     do { \
-	size_t local__len = strlen(s) + 1; \
+	unsigned local__len = (unsigned) (strlen(s) + 1); \
 	DupBlock((v),(s),local__len); \
     } while (0)
 
@@ -138,7 +123,7 @@ Tcl_PkgProvideEx(
 				 * available. */
     const char *name,		/* Name of package. */
     const char *version,	/* Version string for package. */
-    const void *clientData)	/* clientdata for this package (normally used
+    ClientData clientData)	/* clientdata for this package (normally used
 				 * for C callback function table) */
 {
     Package *pkgPtr;
@@ -170,10 +155,8 @@ Tcl_PkgProvideEx(
 	}
 	return TCL_OK;
     }
-    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-	    "conflicting versions provided for package \"%s\": %s, then %s",
-	    name, pkgPtr->version, version));
-    Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "VERSIONCONFLICT", NULL);
+    Tcl_AppendResult(interp, "conflicting versions provided for package \"",
+	    name, "\": ", pkgPtr->version, ", then ", version, NULL);
     return TCL_ERROR;
 }
 
@@ -204,62 +187,6 @@ Tcl_PkgProvideEx(
  *----------------------------------------------------------------------
  */
 
-static void PkgFilesCleanupProc(ClientData clientData,
-    			    Tcl_Interp *interp)
-{
-    PkgFiles *pkgFiles = (PkgFiles *) clientData;
-    Tcl_HashSearch search;
-    Tcl_HashEntry *entry;
-
-    while (pkgFiles->names) {
-	PkgName *name = pkgFiles->names;
-	pkgFiles->names = name->nextPtr;
-	ckfree(name);
-    }
-    entry = Tcl_FirstHashEntry(&pkgFiles->table, &search);
-    while (entry) {
-	Tcl_Obj *obj = (Tcl_Obj *)Tcl_GetHashValue(entry);
-	Tcl_DecrRefCount(obj);
-	entry = Tcl_NextHashEntry(&search);
-    }
-    Tcl_DeleteHashTable(&pkgFiles->table);
-    return;
-}
-
-void *TclInitPkgFiles(Tcl_Interp *interp)
-{
-    /* If assocdata "tclPkgFiles" doesn't exist yet, create it */
-    PkgFiles *pkgFiles = Tcl_GetAssocData(interp, "tclPkgFiles", NULL);
-    if (!pkgFiles) {
-	pkgFiles = ckalloc(sizeof(PkgFiles));
-	pkgFiles->names = NULL;
-	Tcl_InitHashTable(&pkgFiles->table, TCL_STRING_KEYS);
-	Tcl_SetAssocData(interp, "tclPkgFiles", PkgFilesCleanupProc, pkgFiles);
-    }
-    return pkgFiles;
-}
-
-void TclPkgFileSeen(Tcl_Interp *interp, const char *fileName)
-{
-    PkgFiles *pkgFiles = (PkgFiles *) Tcl_GetAssocData(interp, "tclPkgFiles", NULL);
-    if (pkgFiles && pkgFiles->names) {
-	const char *name = pkgFiles->names->name;
-	Tcl_HashTable *table = &pkgFiles->table;
-	int new;
-	Tcl_HashEntry *entry = Tcl_CreateHashEntry(table, name, &new);
-	Tcl_Obj *list;
-
-	if (new) {
-	    list = Tcl_NewObj();
-	    Tcl_SetHashValue(entry, list);
-	    Tcl_IncrRefCount(list);
-	} else {
-	    list = Tcl_GetHashValue(entry);
-	}
-	Tcl_ListObjAppendElement(interp, list, Tcl_NewStringObj(fileName, -1));
-    }
-}
-
 #undef Tcl_PkgRequire
 const char *
 Tcl_PkgRequire(
@@ -285,7 +212,7 @@ Tcl_PkgRequireEx(
     int exact,			/* Non-zero means that only the particular
 				 * version given is acceptable. Zero means use
 				 * the latest compatible version. */
-    void *clientDataPtr)	/* Used to return the client data for this
+    ClientData *clientDataPtr)	/* Used to return the client data for this
 				 * package. If it is NULL then the client data
 				 * is not returned. This is unchanged if this
 				 * call fails for any reason. */
@@ -358,10 +285,9 @@ Tcl_PkgRequireEx(
 	 */
 
 	tclEmptyStringRep = &tclEmptyString;
-	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"Cannot load package \"%s\" in standalone executable:"
-		" This package is not compiled with stub support", name));
-	Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "UNSTUBBED", NULL);
+	Tcl_AppendResult(interp, "Cannot load package \"", name,
+		"\" in standalone executable: This package is not "
+		"compiled with stub support", NULL);
 	return NULL;
     }
 
@@ -397,7 +323,7 @@ Tcl_PkgRequireProc(
 				 * version. */
     Tcl_Obj *const reqv[],	/* 0 means to use the latest version
 				 * available. */
-    void *clientDataPtr)
+    ClientData *clientDataPtr)
 {
     const char *result =
 	    PkgRequireCore(interp, name, reqc, reqv, clientDataPtr);
@@ -418,7 +344,7 @@ PkgRequireCore(
 				 * version. */
     Tcl_Obj *const reqv[],	/* 0 means to use the latest version
 				 * available. */
-    void *clientDataPtr)
+    ClientData *clientDataPtr)
 {
     Interp *iPtr = (Interp *) interp;
     Package *pkgPtr;
@@ -452,12 +378,10 @@ PkgRequireCore(
 	 */
 
 	if (pkgPtr->clientData != NULL) {
-	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "circular package dependency:"
-		    " attempt to provide %s %s requires %s",
-		    name, (char *) pkgPtr->clientData, name));
+	    Tcl_AppendResult(interp, "circular package dependency: "
+		    "attempt to provide ", name, " ",
+		    (char *) pkgPtr->clientData, " requires ", name, NULL);
 	    AddRequirementsToResult(interp, reqc, reqv);
-	    Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "CIRCULARITY", NULL);
 	    return NULL;
 	}
 
@@ -504,9 +428,7 @@ PkgRequireCore(
 		}
 	    }
 
-	    /*
-	     * We have found a version which is better than our max.
-	     */
+	    /* We have found a version which is better than our max. */
 
 	    if (reqc > 0) {
 		/* Check satisfaction of requirements. */
@@ -559,37 +481,24 @@ PkgRequireCore(
 	     * will still exist when the script completes.
 	     */
 
-	    char *versionToProvide = bestPtr->version;
-	    PkgFiles *pkgFiles;
-	    PkgName *pkgName;
+	    const char *versionToProvide = bestPtr->version;
 	    script = bestPtr->script;
 
-	    pkgPtr->clientData = versionToProvide;
-	    Tcl_Preserve(versionToProvide);
-	    Tcl_Preserve(script);
-	    pkgFiles = TclInitPkgFiles(interp);
-	    /* Push "ifneeded" package name in "tclPkgFiles" assocdata. */
-	    pkgName = ckalloc(sizeof(PkgName) + strlen(name));
-	    pkgName->nextPtr = pkgFiles->names;
-	    strcpy(pkgName->name, name);
-	    pkgFiles->names = pkgName;
+	    pkgPtr->clientData = (ClientData) versionToProvide;
+	    Tcl_Preserve((ClientData) script);
+	    Tcl_Preserve((ClientData) versionToProvide);
 	    code = Tcl_EvalEx(interp, script, -1, TCL_EVAL_GLOBAL);
-	    /* Pop the "ifneeded" package name from "tclPkgFiles" assocdata*/
-	    pkgFiles->names = pkgName->nextPtr;
-	    ckfree(pkgName);
-	    Tcl_Release(script);
+	    Tcl_Release((ClientData) script);
 
 	    pkgPtr = FindPackage(interp, name);
 	    if (code == TCL_OK) {
 		Tcl_ResetResult(interp);
 		if (pkgPtr->version == NULL) {
 		    code = TCL_ERROR;
-		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-			    "attempt to provide package %s %s failed:"
-			    " no version of package %s provided",
-			    name, versionToProvide, name));
-		    Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "UNPROVIDED",
-			    NULL);
+		    Tcl_AppendResult(interp, "attempt to provide package ",
+			    name, " ", versionToProvide,
+			    " failed: no version of package ", name,
+			    " provided", NULL);
 		} else {
 		    char *pvi, *vi;
 
@@ -607,24 +516,21 @@ PkgRequireCore(
 			ckfree(vi);
 			if (res != 0) {
 			    code = TCL_ERROR;
-			    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-				    "attempt to provide package %s %s failed:"
-				    " package %s %s provided instead",
-				    name, versionToProvide,
-				    name, pkgPtr->version));
-			    Tcl_SetErrorCode(interp, "TCL", "PACKAGE",
-				    "WRONGPROVIDE", NULL);
+			    Tcl_AppendResult(interp,
+				    "attempt to provide package ", name, " ",
+				    versionToProvide, " failed: package ",
+				    name, " ", pkgPtr->version,
+				    " provided instead", NULL);
 			}
 		    }
 		}
 	    } else if (code != TCL_ERROR) {
 		Tcl_Obj *codePtr = Tcl_NewIntObj(code);
 
-		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-			"attempt to provide package %s %s failed:"
-			" bad return code: %s",
-			name, versionToProvide, TclGetString(codePtr)));
-		Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "BADRESULT", NULL);
+		Tcl_ResetResult(interp);
+		Tcl_AppendResult(interp, "attempt to provide package ", name,
+			" ", versionToProvide, " failed: bad return code: ",
+			TclGetString(codePtr), NULL);
 		TclDecrRefCount(codePtr);
 		code = TCL_ERROR;
 	    }
@@ -634,7 +540,7 @@ PkgRequireCore(
 			"\n    (\"package ifneeded %s %s\" script)",
 			name, versionToProvide));
 	    }
-	    Tcl_Release(versionToProvide);
+	    Tcl_Release((ClientData) versionToProvide);
 
 	    if (code != TCL_OK) {
 		/*
@@ -681,9 +587,11 @@ PkgRequireCore(
 	    Tcl_DStringFree(&command);
 
 	    if ((code != TCL_OK) && (code != TCL_ERROR)) {
-		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-			"bad return code: %d", code));
-		Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "BADRESULT", NULL);
+		Tcl_Obj *codePtr = Tcl_NewIntObj(code);
+		Tcl_ResetResult(interp);
+		Tcl_AppendResult(interp, "bad return code: ",
+			TclGetString(codePtr), NULL);
+		Tcl_DecrRefCount(codePtr);
 		code = TCL_ERROR;
 	    }
 	    if (code == TCL_ERROR) {
@@ -696,9 +604,7 @@ PkgRequireCore(
     }
 
     if (pkgPtr->version == NULL) {
-	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"can't find package %s", name));
-	Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "UNFOUND", NULL);
+	Tcl_AppendResult(interp, "can't find package ", name, NULL);
 	AddRequirementsToResult(interp, reqc, reqv);
 	return NULL;
     }
@@ -708,29 +614,26 @@ PkgRequireCore(
      * provided version meets the current requirements.
      */
 
-    if (reqc != 0) {
+    if (reqc == 0) {
+	satisfies = 1;
+    } else {
 	CheckVersionAndConvert(interp, pkgPtr->version, &pkgVersionI, NULL);
 	satisfies = SomeRequirementSatisfied(pkgVersionI, reqc, reqv);
 
 	ckfree(pkgVersionI);
+    }
 
-	if (!satisfies) {
-	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "version conflict for package \"%s\": have %s, need",
-		    name, pkgPtr->version));
-	    Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "VERSIONCONFLICT",
-		    NULL);
-	    AddRequirementsToResult(interp, reqc, reqv);
-	    return NULL;
+    if (satisfies) {
+	if (clientDataPtr) {
+	    *clientDataPtr = pkgPtr->clientData;
 	}
+	return pkgPtr->version;
     }
 
-    if (clientDataPtr) {
-	const void **ptr = (const void **) clientDataPtr;
-
-	*ptr = pkgPtr->clientData;
-    }
-    return pkgPtr->version;
+    Tcl_AppendResult(interp, "version conflict for package \"", name,
+	    "\": have ", pkgPtr->version, ", need", NULL);
+    AddRequirementsToResult(interp, reqc, reqv);
+    return NULL;
 }
 
 /*
@@ -779,7 +682,7 @@ Tcl_PkgPresentEx(
     int exact,			/* Non-zero means that only the particular
 				 * version given is acceptable. Zero means use
 				 * the latest compatible version. */
-    void *clientDataPtr)	/* Used to return the client data for this
+    ClientData *clientDataPtr)	/* Used to return the client data for this
 				 * package. If it is NULL then the client data
 				 * is not returned. This is unchanged if this
 				 * call fails for any reason. */
@@ -810,11 +713,10 @@ Tcl_PkgPresentEx(
     }
 
     if (version != NULL) {
-	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"package %s %s is not present", name, version));
+	Tcl_AppendResult(interp, "package ", name, " ", version,
+		" is not present", NULL);
     } else {
-	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"package %s is not present", name));
+	Tcl_AppendResult(interp, "package ", name, " is not present", NULL);
     }
     Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "PACKAGE", name, NULL);
     return NULL;
@@ -845,15 +747,15 @@ Tcl_PackageObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    static const char *const pkgOptions[] = {
-	"files",  "forget",  "ifneeded", "names",   "prefer",
-	"present", "provide", "require",  "unknown", "vcompare",
-	"versions", "vsatisfies", NULL
+    static const char *pkgOptions[] = {
+	"forget",  "ifneeded", "names",   "prefer",   "present",
+	"provide", "require",  "unknown", "vcompare", "versions",
+	"vsatisfies", NULL
     };
     enum pkgOptions {
-	PKG_FILES,  PKG_FORGET,  PKG_IFNEEDED, PKG_NAMES,   PKG_PREFER,
-	PKG_PRESENT, PKG_PROVIDE, PKG_REQUIRE,  PKG_UNKNOWN, PKG_VCOMPARE,
-	PKG_VERSIONS, PKG_VSATISFIES
+	PKG_FORGET,  PKG_IFNEEDED, PKG_NAMES,   PKG_PREFER,   PKG_PRESENT,
+	PKG_PROVIDE, PKG_REQUIRE,  PKG_UNKNOWN, PKG_VCOMPARE, PKG_VERSIONS,
+	PKG_VSATISFIES
     };
     Interp *iPtr = (Interp *) interp;
     int optionIndex, exact, i, satisfies;
@@ -863,11 +765,10 @@ Tcl_PackageObjCmd(
     Tcl_HashSearch search;
     Tcl_HashTable *tablePtr;
     const char *version;
-    const char *argv2, *argv3, *argv4;
-    char *iva = NULL, *ivb = NULL;
+    char *argv2, *argv3, *argv4, *iva = NULL, *ivb = NULL;
 
     if (objc < 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?");
+	Tcl_WrongNumArgs(interp, 1, objv, "option ?arg arg ...?");
 	return TCL_ERROR;
     }
 
@@ -876,37 +777,11 @@ Tcl_PackageObjCmd(
 	return TCL_ERROR;
     }
     switch ((enum pkgOptions) optionIndex) {
-    case PKG_FILES: {
-	PkgFiles *pkgFiles;
-
-	if (objc != 3) {
-	    Tcl_WrongNumArgs(interp, 2, objv, "package");
-	    return TCL_ERROR;
-	}
-	pkgFiles = (PkgFiles *) Tcl_GetAssocData(interp, "tclPkgFiles", NULL);
-	if (pkgFiles) {
-	    Tcl_HashEntry *entry = Tcl_FindHashEntry(&pkgFiles->table, Tcl_GetString(objv[2]));
-	    if (entry) {
-		Tcl_SetObjResult(interp, (Tcl_Obj *)Tcl_GetHashValue(entry));
-	    }
-	}
-	break;
-    }
     case PKG_FORGET: {
-	const char *keyString;
-	PkgFiles *pkgFiles = (PkgFiles *) Tcl_GetAssocData(interp, "tclPkgFiles", NULL);
+	char *keyString;
 
 	for (i = 2; i < objc; i++) {
 	    keyString = TclGetString(objv[i]);
-	    if (pkgFiles) {
-		hPtr = Tcl_FindHashEntry(&pkgFiles->table, keyString);
-		if (hPtr) {
-		    Tcl_Obj *obj = Tcl_GetHashValue(hPtr);
-		    Tcl_DeleteHashEntry(hPtr);
-		    Tcl_DecrRefCount(obj);
-		}
-	    }
-
 	    hPtr = Tcl_FindHashEntry(&iPtr->packageTable, keyString);
 	    if (hPtr == NULL) {
 		continue;
@@ -919,11 +794,11 @@ Tcl_PackageObjCmd(
 	    while (pkgPtr->availPtr != NULL) {
 		availPtr = pkgPtr->availPtr;
 		pkgPtr->availPtr = availPtr->nextPtr;
-		Tcl_EventuallyFree(availPtr->version, TCL_DYNAMIC);
-		Tcl_EventuallyFree(availPtr->script, TCL_DYNAMIC);
-		ckfree(availPtr);
+		Tcl_EventuallyFree((ClientData)availPtr->version, TCL_DYNAMIC);
+		Tcl_EventuallyFree((ClientData)availPtr->script, TCL_DYNAMIC);
+		ckfree((char *) availPtr);
 	    }
-	    ckfree(pkgPtr);
+	    ckfree((char *) pkgPtr);
 	}
 	break;
     }
@@ -950,7 +825,7 @@ Tcl_PackageObjCmd(
 	} else {
 	    pkgPtr = FindPackage(interp, argv2);
 	}
-	argv3 = TclGetStringFromObj(objv[3], &length);
+	argv3 = Tcl_GetStringFromObj(objv[3], &length);
 
 	for (availPtr = pkgPtr->availPtr, prevPtr = NULL; availPtr != NULL;
 		prevPtr = availPtr, availPtr = availPtr->nextPtr) {
@@ -966,11 +841,10 @@ Tcl_PackageObjCmd(
 	    if (res == 0){
 		if (objc == 4) {
 		    ckfree(argv3i);
-		    Tcl_SetObjResult(interp,
-			    Tcl_NewStringObj(availPtr->script, -1));
+		    Tcl_SetResult(interp, availPtr->script, TCL_VOLATILE);
 		    return TCL_OK;
 		}
-		Tcl_EventuallyFree(availPtr->script, TCL_DYNAMIC);
+		Tcl_EventuallyFree((ClientData)availPtr->script, TCL_DYNAMIC);
 		break;
 	    }
 	}
@@ -980,7 +854,7 @@ Tcl_PackageObjCmd(
 	    return TCL_OK;
 	}
 	if (availPtr == NULL) {
-	    availPtr = ckalloc(sizeof(PkgAvail));
+	    availPtr = (PkgAvail *) ckalloc(sizeof(PkgAvail));
 	    DupBlock(availPtr->version, argv3, (unsigned) length + 1);
 
 	    if (prevPtr == NULL) {
@@ -991,7 +865,7 @@ Tcl_PackageObjCmd(
 		prevPtr->nextPtr = availPtr;
 	    }
 	}
-	argv4 = TclGetStringFromObj(objv[4], &length);
+	argv4 = Tcl_GetStringFromObj(objv[4], &length);
 	DupBlock(availPtr->script, argv4, (unsigned) length + 1);
 	break;
     }
@@ -999,25 +873,18 @@ Tcl_PackageObjCmd(
 	if (objc != 2) {
 	    Tcl_WrongNumArgs(interp, 2, objv, NULL);
 	    return TCL_ERROR;
-	} else {
-	    Tcl_Obj *resultObj;
-
-	    resultObj = Tcl_NewObj();
-	    tablePtr = &iPtr->packageTable;
-	    for (hPtr = Tcl_FirstHashEntry(tablePtr, &search); hPtr != NULL;
-		    hPtr = Tcl_NextHashEntry(&search)) {
-		pkgPtr = Tcl_GetHashValue(hPtr);
-		if ((pkgPtr->version != NULL) || (pkgPtr->availPtr != NULL)) {
-		    Tcl_ListObjAppendElement(NULL,resultObj, Tcl_NewStringObj(
-			    Tcl_GetHashKey(tablePtr, hPtr), -1));
-		}
+	}
+	tablePtr = &iPtr->packageTable;
+	for (hPtr = Tcl_FirstHashEntry(tablePtr, &search); hPtr != NULL;
+		hPtr = Tcl_NextHashEntry(&search)) {
+	    pkgPtr = Tcl_GetHashValue(hPtr);
+	    if ((pkgPtr->version != NULL) || (pkgPtr->availPtr != NULL)) {
+		Tcl_AppendElement(interp, Tcl_GetHashKey(tablePtr, hPtr));
 	    }
-	    Tcl_SetObjResult(interp, resultObj);
 	}
 	break;
     case PKG_PRESENT: {
 	const char *name;
-
 	if (objc < 3) {
 	    goto require;
 	}
@@ -1072,8 +939,7 @@ Tcl_PackageObjCmd(
 	    if (hPtr != NULL) {
 		pkgPtr = Tcl_GetHashValue(hPtr);
 		if (pkgPtr->version != NULL) {
-		    Tcl_SetObjResult(interp,
-			    Tcl_NewStringObj(pkgPtr->version, -1));
+		    Tcl_SetResult(interp, pkgPtr->version, TCL_VOLATILE);
 		}
 	    }
 	    return TCL_OK;
@@ -1088,7 +954,7 @@ Tcl_PackageObjCmd(
 	if (objc < 3) {
 	requireSyntax:
 	    Tcl_WrongNumArgs(interp, 2, objv,
-		    "?-exact? package ?requirement ...?");
+		    "?-exact? package ?requirement...?");
 	    return TCL_ERROR;
 	}
 
@@ -1135,14 +1001,13 @@ Tcl_PackageObjCmd(
 
 	if (objc == 2) {
 	    if (iPtr->packageUnknown != NULL) {
-		Tcl_SetObjResult(interp,
-			Tcl_NewStringObj(iPtr->packageUnknown, -1));
+		Tcl_SetResult(interp, iPtr->packageUnknown, TCL_VOLATILE);
 	    }
 	} else if (objc == 3) {
 	    if (iPtr->packageUnknown != NULL) {
 		ckfree(iPtr->packageUnknown);
 	    }
-	    argv2 = TclGetStringFromObj(objv[2], &length);
+	    argv2 = Tcl_GetStringFromObj(objv[2], &length);
 	    if (argv2[0] == 0) {
 		iPtr->packageUnknown = NULL;
 	    } else {
@@ -1155,7 +1020,7 @@ Tcl_PackageObjCmd(
 	break;
     }
     case PKG_PREFER: {
-	static const char *const pkgPreferOptions[] = {
+	static const char *pkgPreferOptions[] = {
 	    "latest", "stable", NULL
 	};
 
@@ -1224,27 +1089,23 @@ Tcl_PackageObjCmd(
 	if (objc != 3) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "package");
 	    return TCL_ERROR;
-	} else {
-	    Tcl_Obj *resultObj = Tcl_NewObj();
-
-	    argv2 = TclGetString(objv[2]);
-	    hPtr = Tcl_FindHashEntry(&iPtr->packageTable, argv2);
-	    if (hPtr != NULL) {
-		pkgPtr = Tcl_GetHashValue(hPtr);
-		for (availPtr = pkgPtr->availPtr; availPtr != NULL;
-			availPtr = availPtr->nextPtr) {
-		    Tcl_ListObjAppendElement(NULL, resultObj,
-			    Tcl_NewStringObj(availPtr->version, -1));
-		}
+	}
+	argv2 = TclGetString(objv[2]);
+	hPtr = Tcl_FindHashEntry(&iPtr->packageTable, argv2);
+	if (hPtr != NULL) {
+	    pkgPtr = Tcl_GetHashValue(hPtr);
+	    for (availPtr = pkgPtr->availPtr; availPtr != NULL;
+		    availPtr = availPtr->nextPtr) {
+		Tcl_AppendElement(interp, availPtr->version);
 	    }
-	    Tcl_SetObjResult(interp, resultObj);
 	}
 	break;
     case PKG_VSATISFIES: {
 	char *argv2i = NULL;
 
 	if (objc < 4) {
-	    Tcl_WrongNumArgs(interp, 2, objv, "version ?requirement ...?");
+	    Tcl_WrongNumArgs(interp, 2, objv,
+		    "version requirement requirement...");
 	    return TCL_ERROR;
 	}
 
@@ -1298,7 +1159,7 @@ FindPackage(
 
     hPtr = Tcl_CreateHashEntry(&iPtr->packageTable, name, &isNew);
     if (isNew) {
-	pkgPtr = ckalloc(sizeof(Package));
+	pkgPtr = (Package *) ckalloc(sizeof(Package));
 	pkgPtr->version = NULL;
 	pkgPtr->availPtr = NULL;
 	pkgPtr->clientData = NULL;
@@ -1328,7 +1189,7 @@ FindPackage(
 
 void
 TclFreePackageInfo(
-    Interp *iPtr)		/* Interpreter that is being deleted. */
+    Interp *iPtr)		/* Interpereter that is being deleted. */
 {
     Package *pkgPtr;
     Tcl_HashSearch search;
@@ -1344,11 +1205,11 @@ TclFreePackageInfo(
 	while (pkgPtr->availPtr != NULL) {
 	    availPtr = pkgPtr->availPtr;
 	    pkgPtr->availPtr = availPtr->nextPtr;
-	    Tcl_EventuallyFree(availPtr->version, TCL_DYNAMIC);
-	    Tcl_EventuallyFree(availPtr->script, TCL_DYNAMIC);
-	    ckfree(availPtr);
+	    Tcl_EventuallyFree((ClientData)availPtr->version, TCL_DYNAMIC);
+	    Tcl_EventuallyFree((ClientData)availPtr->script, TCL_DYNAMIC);
+	    ckfree((char *) availPtr);
 	}
-	ckfree(pkgPtr);
+	ckfree((char *) pkgPtr);
     }
     Tcl_DeleteHashTable(&iPtr->packageTable);
     if (iPtr->packageUnknown != NULL) {
@@ -1470,9 +1331,8 @@ CheckVersionAndConvert(
 
   error:
     ckfree(ibuf);
-    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-	    "expected version number but got \"%s\"", string));
-    Tcl_SetErrorCode(interp, "TCL", "VALUE", "VERSION", NULL);
+    Tcl_AppendResult(interp, "expected version number but got \"", string,
+	    "\"", NULL);
     return TCL_ERROR;
 }
 
@@ -1733,9 +1593,8 @@ CheckRequirement(
 	 * More dashes found after the first. This is wrong.
 	 */
 
-	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"expected versionMin-versionMax but got \"%s\"", string));
-	Tcl_SetErrorCode(interp, "TCL", "VALUE", "VERSIONRANGE", NULL);
+	Tcl_AppendResult(interp, "expected versionMin-versionMax but got \"",
+		string, "\"", NULL);
 	return TCL_ERROR;
     }
 
@@ -1786,17 +1645,19 @@ AddRequirementsToResult(
     Tcl_Obj *const reqv[])	/* 0 means to use the latest version
 				 * available. */
 {
-    Tcl_Obj *result = Tcl_GetObjResult(interp);
-    int i, length;
+    if (reqc > 0) {
+	int i;
 
-    for (i = 0; i < reqc; i++) {
-	const char *v = TclGetStringFromObj(reqv[i], &length);
+	for (i = 0; i < reqc; i++) {
+	    int length;
+	    char *v = Tcl_GetStringFromObj(reqv[i], &length);
 
-	if ((length & 0x1) && (v[length/2] == '-')
-		&& (strncmp(v, v+((length+1)/2), length/2) == 0)) {
-	    Tcl_AppendPrintfToObj(result, " exactly %s", v+((length+1)/2));
-	} else {
-	    Tcl_AppendPrintfToObj(result, " %s", v);
+	    if ((length & 0x1) && (v[length/2] == '-')
+		    && (strncmp(v, v+((length+1)/2), length/2) == 0)) {
+		Tcl_AppendResult(interp, " exactly ", v+((length+1)/2), NULL);
+	    } else {
+		Tcl_AppendResult(interp, " ", v, NULL);
+	    }
 	}
     }
 }
@@ -1825,15 +1686,15 @@ AddRequirementsToDString(
     Tcl_Obj *const reqv[])	/* 0 means to use the latest version
 				 * available. */
 {
-    int i;
-
     if (reqc > 0) {
+	int i;
+
 	for (i = 0; i < reqc; i++) {
-	    TclDStringAppendLiteral(dsPtr, " ");
-	    TclDStringAppendObj(dsPtr, reqv[i]);
+	    Tcl_DStringAppend(dsPtr, " ", 1);
+	    Tcl_DStringAppend(dsPtr, TclGetString(reqv[i]), -1);
 	}
     } else {
-	TclDStringAppendLiteral(dsPtr, " 0-");
+	Tcl_DStringAppend(dsPtr, " 0-", -1);
     }
 }
 
@@ -2003,7 +1864,7 @@ Tcl_PkgInitStubsCheck(
 {
     const char *actualVersion = Tcl_PkgPresent(interp, "Tcl", version, 0);
 
-    if ((exact&1) && actualVersion) {
+    if (exact && actualVersion) {
 	const char *p = version;
 	int count = 0;