lint

5 files changed, 17 insertions, 11 deletions

diff --git a/generic/tkBitmap.c b/generic/tkBitmap.c
index e5768e9..a6d3a95 100644
--- a/generic/tkBitmap.c
+++ b/generic/tkBitmap.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkBitmap.c,v 1.1.4.5 1999/03/30 04:11:56 stanton Exp $
+ * RCS: @(#) $Id: tkBitmap.c,v 1.1.4.6 1999/03/30 23:56:54 stanton Exp $
  */
 
 #include "tkPort.h"
@@ -347,8 +347,14 @@ GetBitmap(interp, tkwin, string)
                     " safe interpreter", (char *) NULL);
             goto error;
         }
-        
-	string = Tcl_TranslateFileName(interp, string + 1, &buffer);
+
+	/*
+	 * Note that we need to cast away the CONST from the string because
+	 * Tcl_TranslateFileName is non const, even though it doesn't modify
+	 * the string.
+	 */
+
+	string = Tcl_TranslateFileName(interp, (char *) string + 1, &buffer);
 	if (string == NULL) {
 	    goto error;
 	}
diff --git a/generic/tkButton.c b/generic/tkButton.c
index 7f6f297..8c0b84d 100644
--- a/generic/tkButton.c
+++ b/generic/tkButton.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkButton.c,v 1.1.4.5 1999/02/16 06:00:40 lfb Exp $
+ * RCS: @(#) $Id: tkButton.c,v 1.1.4.6 1999/03/30 23:56:55 stanton Exp $
  */
 
 #include "tkButton.h"
@@ -977,7 +977,7 @@ ConfigureButton(interp, butPtr, objc, objv)
     Tcl_Obj *CONST objv[];	/* Argument values. */
 {
     Tk_SavedOptions savedOptions;
-    Tcl_Obj *errorResult;
+    Tcl_Obj *errorResult = NULL;
     int error;
     Tk_Image image;
 
diff --git a/generic/tkEntry.c b/generic/tkEntry.c
index 8a46300..b7a1a40 100644
--- a/generic/tkEntry.c
+++ b/generic/tkEntry.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkEntry.c,v 1.1.4.5 1999/03/30 04:12:56 stanton Exp $
+ * RCS: @(#) $Id: tkEntry.c,v 1.1.4.6 1999/03/30 23:56:56 stanton Exp $
  */
 
 #include "tkInt.h"
@@ -1049,7 +1049,7 @@ ConfigureEntry(interp, entryPtr, objc, objv, flags)
     int flags;			/* Flags to pass to Tk_ConfigureWidget. */
 {
     Tk_SavedOptions savedOptions;
-    Tcl_Obj *errorResult;
+    Tcl_Obj *errorResult = NULL;
     int error;
     int oldExport;
 
diff --git a/generic/tkMenubutton.c b/generic/tkMenubutton.c
index 64760b0..cc3647d 100644
--- a/generic/tkMenubutton.c
+++ b/generic/tkMenubutton.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: tkMenubutton.c,v 1.1.4.6 1999/02/16 06:00:41 lfb Exp $
+ * RCS: @(#) $Id: tkMenubutton.c,v 1.1.4.7 1999/03/30 23:56:57 stanton Exp $
  */
 
 #include "tkMenubutton.h"
@@ -498,7 +498,7 @@ ConfigureMenuButton(interp, mbPtr, objc, objv)
     Tcl_Obj *CONST objv[];	/* Arguments. */
 {
     Tk_SavedOptions savedOptions;
-    Tcl_Obj *errorResult;
+    Tcl_Obj *errorResult = NULL;
     int error;
     Tk_Image image;
 
diff --git a/generic/tkScale.c b/generic/tkScale.c
index 70c6695..db93838 100644
--- a/generic/tkScale.c
+++ b/generic/tkScale.c
@@ -17,7 +17,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkScale.c,v 1.1.4.7 1999/03/26 19:14:46 hershey Exp $
+ * RCS: @(#) $Id: tkScale.c,v 1.1.4.8 1999/03/30 23:56:57 stanton Exp $
  */
 
 #include "tkPort.h"
@@ -582,7 +582,7 @@ ConfigureScale(interp, scalePtr, objc, objv)
     Tcl_Obj *CONST objv[];	/* Argument values. */
 {
     Tk_SavedOptions savedOptions;
-    Tcl_Obj *errorResult;
+    Tcl_Obj *errorResult = NULL;
     int error;
     char *label;