* Updated callers of Tcl_SplitList and Tcl_Merge.

	* Updated callers of Tcl_GetStringResult.
	  Rewrote PrintScrollFractions to ScrollFractions to stop scribbling
	  directly on interp->result.
	* Updated callers of Tcl_GetVar, Tcl_GetVar2
	* Updated callers of Tcl_SplitPath, Tcl_JoinPath, and
	  Tcl_TranslateFileName.


FossilOrigin-Name: 933dcfe881579bb3925ff2a05e925a0bd8d67087

4 files changed, 19 insertions, 19 deletions

diff --git a/mac/tkMacCursor.c b/mac/tkMacCursor.c
index f03f207..1a5ded8 100644
--- a/mac/tkMacCursor.c
+++ b/mac/tkMacCursor.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: tkMacCursor.c,v 1.5 1999/04/16 01:51:30 stanton Exp $
+ * RCS: @(#) $Id: tkMacCursor.c,v 1.6 2002/01/25 21:09:37 dgp Exp $
  */
 
 #include "tkPort.h"
@@ -80,7 +80,7 @@ static int gTkOwnsCursor = true;             /* A boolean indicating whether
  */
 
 static  void FindCursorByName _ANSI_ARGS_ ((TkMacCursor *macCursorPtr,
-	             char *string));
+	             CONST char *string));
 
 /*
  *----------------------------------------------------------------------
@@ -105,7 +105,7 @@ static  void FindCursorByName _ANSI_ARGS_ ((TkMacCursor *macCursorPtr,
 void 
 FindCursorByName(
     TkMacCursor *macCursorPtr,
-    char *string)
+    CONST char *string)
 {
     Handle resource;
     Str255 curName;
@@ -200,7 +200,7 @@ TkGetCursorByName(
         FindCursorByName(macCursorPtr, string);
 
 	if (macCursorPtr->macCursor == NULL) {
-	    char **argv;
+	    CONST char **argv;
 	    int argc, err;
 	    
 	    /*
diff --git a/mac/tkMacInit.c b/mac/tkMacInit.c
index 9e70594..e461073 100644
--- a/mac/tkMacInit.c
+++ b/mac/tkMacInit.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacInit.c,v 1.5 2001/12/27 22:45:10 das Exp $
+ * RCS: @(#) $Id: tkMacInit.c,v 1.6 2002/01/25 21:09:37 dgp Exp $
  */
 
 #include <Resources.h>
@@ -54,7 +54,7 @@ int
 TkpInit(
     Tcl_Interp *interp)		/* Interp to initialize. */
 {
-    char *libDir, *tempPath;
+    CONST char *libDir, *tempPath;
     Tcl_DString path, ds;
     int result;
 
@@ -115,7 +115,7 @@ tkInit";
     tempPath = TclGetEnv("EXT_FOLDER", &ds);
     if ((tempPath != NULL) && (tempPath[0] != '\0')) {
 	    Tcl_DString libPath;
-	    char *argv[3];
+	    CONST char *argv[3];
 	    
 	    argv[0] = tempPath;
 	    argv[1] = "Tool Command Language";	    
@@ -169,7 +169,7 @@ TkpGetAppName(
     Tcl_DString *namePtr)	/* A previously initialized Tcl_DString. */
 {
     int argc;
-    char **argv = NULL, *name, *p;
+    CONST char **argv = NULL, *name, *p;
     Handle h = NULL;
 
     h = GetNamedResource('STR ', "\pTk App Name");
@@ -222,8 +222,8 @@ TkpGetAppName(
 
 void
 TkpDisplayWarning(
-    char *msg,			/* Message to be displayed. */
-    char *title)		/* Title of warning. */
+    CONST char *msg,		/* Message to be displayed. */
+    CONST char *title)		/* Title of warning. */
 {
     Tcl_DString ds;
     Tcl_DStringInit(&ds);
diff --git a/mac/tkMacWm.c b/mac/tkMacWm.c
index f96daab..6a7e8c0 100644
--- a/mac/tkMacWm.c
+++ b/mac/tkMacWm.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: tkMacWm.c,v 1.13 2001/12/05 01:30:44 das Exp $
+ * RCS: @(#) $Id: tkMacWm.c,v 1.14 2002/01/25 21:09:37 dgp Exp $
  */
 
 #include <Gestalt.h>
@@ -194,7 +194,7 @@ typedef struct TkWmInfo {
     ProtocolHandler *protPtr;	/* First in list of protocol handlers for
 				 * this window (NULL means none). */
     int cmdArgc;		/* Number of elements in cmdArgv below. */
-    char **cmdArgv;		/* Array of strings to store in the
+    CONST char **cmdArgv;	/* Array of strings to store in the
 				 * WM_COMMAND property.  NULL means nothing
 				 * available. */
     char *clientMachine;	/* String to store in WM_CLIENT_MACHINE
@@ -814,7 +814,7 @@ Tk_WmCmd(
 	TkWindow **cmapList;
 	TkWindow *winPtr2;
 	int i, windowArgc, gotToplevel = 0;
-	char **windowArgv;
+	CONST char **windowArgv;
 
 	if ((argc != 3) && (argc != 4)) {
 	    Tcl_AppendResult(interp, "wrong # arguments: must be \"",
@@ -880,7 +880,7 @@ Tk_WmCmd(
     } else if ((c == 'c') && (strncmp(argv[1], "command", length) == 0)
 	    && (length >= 3)) {
 	int cmdArgc;
-	char **cmdArgv;
+	CONST char **cmdArgv;
 
 	if ((argc != 3) && (argc != 4)) {
 	    Tcl_AppendResult(interp, "wrong # arguments: must be \"",
@@ -4231,7 +4231,7 @@ TkUnsupported1Cmd(
 	    } else {
 	        int foundOne = 0;
 	        int attrArgc, i;
-	        char **attrArgv = NULL;
+	        CONST char **attrArgv = NULL;
 	        
 	        if (Tcl_SplitList(interp, argv[4], &attrArgc, &attrArgv) != TCL_OK) {
 	            wmPtr->macClass = oldClass;
diff --git a/mac/tkMacXStubs.c b/mac/tkMacXStubs.c
index 7fd822e..8661392 100644
--- a/mac/tkMacXStubs.c
+++ b/mac/tkMacXStubs.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: tkMacXStubs.c,v 1.10 2000/02/10 09:00:31 jingham Exp $
+ * RCS: @(#) $Id: tkMacXStubs.c,v 1.11 2002/01/25 21:09:37 dgp Exp $
  */
 
 #include "tkInt.h"
@@ -90,7 +90,7 @@ int _XInitImageFuncPtrs _ANSI_ARGS_((XImage *image));
 
 TkDisplay *
 TkpOpenDisplay(
-    char *display_name)
+    CONST char *display_name)
 {
     Display *display;
     Screen *screen;
@@ -793,10 +793,10 @@ XCreateIC(
  *----------------------------------------------------------------------
  */
 
-char *
+CONST char *
 TkGetDefaultScreenName(
     Tcl_Interp *interp,		/* Not used. */
-    char *screenName)		/* If NULL, use default string. */
+    CONST char *screenName)	/* If NULL, use default string. */
 {
     if ((screenName == NULL) || (screenName[0] == '\0')) {
 	screenName = macScreenName;