1 files changed, 21 insertions, 24 deletions

diff --git a/generic/tkConfig.c b/generic/tkConfig.c
index 5262f58..b3e76d2 100644
--- a/generic/tkConfig.c
+++ b/generic/tkConfig.c
@@ -205,7 +205,7 @@ Tk_CreateOptionTable(
     hashEntryPtr = Tcl_CreateHashEntry(hashTablePtr, (char *) templatePtr,
 	    &newEntry);
     if (!newEntry) {
-	tablePtr = (OptionTable *) Tcl_GetHashValue(hashEntryPtr);
+	tablePtr = Tcl_GetHashValue(hashEntryPtr);
 	tablePtr->refCount++;
 	return (Tk_OptionTable) tablePtr;
     }
@@ -391,12 +391,11 @@ DestroyOptionHashTable(
     Tcl_HashTable *hashTablePtr = clientData;
     Tcl_HashSearch search;
     Tcl_HashEntry *hashEntryPtr;
-    OptionTable *tablePtr;
 
     for (hashEntryPtr = Tcl_FirstHashEntry(hashTablePtr, &search);
 	    hashEntryPtr != NULL;
 	    hashEntryPtr = Tcl_NextHashEntry(&search)) {
-	tablePtr = (OptionTable *) Tcl_GetHashValue(hashEntryPtr);
+	OptionTable *tablePtr = Tcl_GetHashValue(hashEntryPtr);
 
 	/*
 	 * The following statements do two tricky things:
@@ -946,16 +945,13 @@ DoObjConfig(
 	break;
     }
 
-    {
-	char buf[40+TCL_INTEGER_SPACE];
-
     default:
-	sprintf(buf, "bad config table: unknown type %d",
-		optionPtr->specPtr->type);
-	Tcl_SetResult(interp, buf, TCL_VOLATILE);
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"bad config table: unknown type %d",
+		optionPtr->specPtr->type));
+	Tcl_SetErrorCode(interp, "TK", "BAD_CONFIG", NULL);
 	return TCL_ERROR;
     }
-    }
 
     /*
      * Release resources associated with the old value, if we're not returning
@@ -1161,7 +1157,9 @@ GetOptionFromObj(
 
   error:
     if (interp != NULL) {
-	Tcl_AppendResult(interp, "unknown option \"", name, "\"", NULL);
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"unknown option \"%s\"", name));
+	Tcl_SetErrorCode(interp, "TK", "LOOKUP", "OPTION", name, NULL);
     }
     return NULL;
 }
@@ -1228,12 +1226,13 @@ SetOptionFromAny(
     Tcl_Interp *interp,		/* Used for error reporting if not NULL. */
     register Tcl_Obj *objPtr)	/* The object to convert. */
 {
-    Tcl_AppendResult(interp,
+    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 	    "can't convert value to option except via GetOptionFromObj API",
-	    NULL);
+	    -1));
+    Tcl_SetErrorCode(interp, "TK", "API_ABUSE", NULL);
     return TCL_ERROR;
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -1346,8 +1345,10 @@ Tk_SetOptions(
 
 	if (objc < 2) {
 	    if (interp != NULL) {
-		Tcl_AppendResult(interp, "value for \"",
-			Tcl_GetStringFromObj(*objv, NULL), "\" missing",NULL);
+		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			"value for \"%s\" missing",
+			Tcl_GetStringFromObj(*objv, NULL)));
+		Tcl_SetErrorCode(interp, "TK", "VALUE_MISSING", NULL);
 		goto error;
 	    }
 	}
@@ -1369,11 +1370,9 @@ Tk_SetOptions(
 	if (DoObjConfig(interp, recordPtr, optionPtr, objv[1], tkwin,
 		(savePtr != NULL) ? &lastSavePtr->items[lastSavePtr->numItems]
 		: NULL) != TCL_OK) {
-	    char msg[100];
-
-	    sprintf(msg, "\n    (processing \"%.40s\" option)",
-		    Tcl_GetStringFromObj(*objv, NULL));
-	    Tcl_AddErrorInfo(interp, msg);
+	    Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
+		    "\n    (processing \"%.40s\" option)",
+		    Tcl_GetStringFromObj(*objv, NULL)));
 	    goto error;
 	}
 	if (savePtr != NULL) {
@@ -1771,7 +1770,6 @@ FreeResources(
  *	single option or all the configuration options in a table.
  *
  * Results:
-
  *	This function normally returns a pointer to an object. If namePtr
  *	isn't NULL, then the result object is a list with five elements: the
  *	option's name, its database name, database class, default value, and
@@ -2154,8 +2152,7 @@ TkDebugConfig(
     Tcl_Obj *objPtr;
 
     objPtr = Tcl_NewObj();
-    hashTablePtr = (Tcl_HashTable *) Tcl_GetAssocData(interp, OPTION_HASH_KEY,
-	    NULL);
+    hashTablePtr = Tcl_GetAssocData(interp, OPTION_HASH_KEY, NULL);
     if (hashTablePtr == NULL) {
 	return objPtr;
     }