assorted typos and errors caught by compiler

3 files changed, 9 insertions, 7 deletions

diff --git a/generic/tkGrid.c b/generic/tkGrid.c
index cd4df5c..1844bcf 100644
--- a/generic/tkGrid.c
+++ b/generic/tkGrid.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkGrid.c,v 1.38 2005/08/10 22:02:22 dkf Exp $
+ * RCS: @(#) $Id: tkGrid.c,v 1.39 2005/08/11 01:32:26 dgp Exp $
  */
 
 #include "tkInt.h"
@@ -2494,7 +2494,7 @@ CheckSlotData(masterPtr, slot, slotType, checkOnly)
 	    	masterPtr->masterDataPtr->rowSpace = newNumSlot;
 	    } else {
 	    	masterPtr->masterDataPtr->columnPtr = newSI;
-	    	masterPtr->masterDataPtr->columnSpace = newNumSlotSI;
+	    	masterPtr->masterDataPtr->columnSpace = newNumSlot;
 	    }
 	}
 	if (slot >= end && checkOnly != CHECK_SPACE) {
diff --git a/generic/tkImage.c b/generic/tkImage.c
index 570d39f..737ad7b 100644
--- a/generic/tkImage.c
+++ b/generic/tkImage.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkImage.c,v 1.23 2005/08/10 22:02:22 dkf Exp $
+ * RCS: @(#) $Id: tkImage.c,v 1.24 2005/08/11 01:32:26 dgp Exp $
  */
 
 #include "tkInt.h"
@@ -172,9 +172,9 @@ Tk_ImageObjCmd(clientData, interp, objc, objv)
     Image *imagePtr;
     Tcl_HashEntry *hPtr;
     Tcl_HashSearch search;
-    char idString[16 + TCL_INTEGER_SPACE], *name;
+    char idString[16 + TCL_INTEGER_SPACE];
     TkDisplay *dispPtr = winPtr->dispPtr;
-    CONST char *arg;
+    char *arg, *name;
     ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
             Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
@@ -429,6 +429,8 @@ Tk_ImageObjCmd(clientData, interp, objc, objv)
 	    Tcl_SetIntObj(Tcl_GetObjResult(interp), masterPtr->width);
 	    break;
 	}
+	default:
+	    Tcl_Panic("can't happen");
 	break;
     }
     return TCL_OK;
diff --git a/generic/tkPack.c b/generic/tkPack.c
index 105bca0..bdc1f37 100644
--- a/generic/tkPack.c
+++ b/generic/tkPack.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkPack.c,v 1.22 2005/08/10 22:02:22 dkf Exp $
+ * RCS: @(#) $Id: tkPack.c,v 1.23 2005/08/11 01:32:26 dgp Exp $
  */
 
 #include "tkPort.h"
@@ -124,7 +124,6 @@ static void		DestroyPacker(char *memPtr);
 static Packer *		GetPacker(Tk_Window tkwin);
 static int		PackAfter(Tcl_Interp *interp, Packer *prevPtr,
 			    Packer *masterPtr, int objc,Tcl_Obj *CONST objv[]);
-static void		PackReqProc(ClientData clientData, Tk_Window tkwin);
 static void		PackStructureProc(ClientData clientData,
 			    XEvent *eventPtr);
 static void		Unlink(Packer *packPtr);
@@ -451,6 +450,7 @@ Tk_PackObjCmd(clientData, interp, objc, objv)
 	}
 	break;
     }
+    }
 
     return TCL_OK;
 }