Get rid of pre-C89-isms (esp. CONST vs const).

1 files changed, 85 insertions, 79 deletions

diff --git a/generic/tkConsole.c b/generic/tkConsole.c
index 0ea2051..5d0ba6e 100644
--- a/generic/tkConsole.c
+++ b/generic/tkConsole.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: tkConsole.c,v 1.36 2008/04/01 16:30:52 dgp Exp $
+ * RCS: @(#) $Id: tkConsole.c,v 1.37 2008/04/27 22:38:56 dkf Exp $
  */
 
 #include "tk.h"
@@ -48,19 +48,19 @@ typedef struct ChannelData {
 static int	ConsoleClose(ClientData instanceData, Tcl_Interp *interp);
 static void	ConsoleDeleteProc(ClientData clientData);
 static void	ConsoleEventProc(ClientData clientData, XEvent *eventPtr);
-static int	ConsoleHandle(ClientData instanceData,
-		    int direction, ClientData *handlePtr);
-static int	ConsoleInput(ClientData instanceData,
-		    char *buf, int toRead, int *errorCode);
+static int	ConsoleHandle(ClientData instanceData, int direction,
+		    ClientData *handlePtr);
+static int	ConsoleInput(ClientData instanceData, char *buf, int toRead,
+		    int *errorCode);
 static int	ConsoleObjCmd(ClientData clientData, Tcl_Interp *interp,
-		    int objc, Tcl_Obj *CONST objv[]);
-static int	ConsoleOutput(ClientData instanceData,
-		    CONST char *buf, int toWrite, int *errorCode);
+		    int objc, Tcl_Obj *const objv[]);
+static int	ConsoleOutput(ClientData instanceData, const char *buf,
+		    int toWrite, int *errorCode);
 static void	ConsoleWatch(ClientData instanceData, int mask);
 static void	DeleteConsoleInterp(ClientData clientData);
 static void	InterpDeleteProc(ClientData clientData, Tcl_Interp *interp);
 static int	InterpreterObjCmd(ClientData clientData, Tcl_Interp *interp,
-		    int objc, Tcl_Obj *CONST objv[]);
+		    int objc, Tcl_Obj *const objv[]);
 
 /*
  * This structure describes the channel type structure for file based IO:
@@ -175,7 +175,7 @@ ShouldUseConsoleChannel(
      */
 
     if (fileType == FILE_TYPE_CHAR) {
-	dcb.DCBlength = sizeof( DCB ) ;
+	dcb.DCBlength = sizeof(DCB);
 	if (!GetConsoleMode(handle, &consoleParams) &&
 		!GetCommState(handle, &dcb)) {
 	    /*
@@ -237,9 +237,12 @@ Tk_InitConsoleChannels(
         return;
     }
 
-    consoleInitPtr = Tcl_GetThreadData(&consoleInitKey, (int)sizeof(int));
+    consoleInitPtr = Tcl_GetThreadData(&consoleInitKey, (int) sizeof(int));
     if (*consoleInitPtr) {
-	/* We've already initialized console channels in this thread. */
+	/*
+	 * We've already initialized console channels in this thread.
+	 */
+
 	return;
     }
     *consoleInitPtr = 1;
@@ -250,15 +253,16 @@ Tk_InitConsoleChannels(
 
     if (!(doIn || doOut || doErr)) {
 	/*
-	 * No std channels should be tied to the console;
-	 * Thus, no need to create the console
+	 * No std channels should be tied to the console; thus, no need to
+	 * create the console.
 	 */
+
 	return;
     }
 
     /*
-     * At least one std channel wants to be tied to the console,
-     * so create the interp for it to live in.
+     * At least one std channel wants to be tied to the console, so create the
+     * interp for it to live in.
      */
 
     info = (ConsoleInfo *) ckalloc(sizeof(ConsoleInfo));
@@ -268,18 +272,16 @@ Tk_InitConsoleChannels(
 
     if (doIn) {
 	ChannelData *data = (ChannelData *) ckalloc(sizeof(ChannelData));
+
 	data->info = info;
 	data->info->refCount++;
 	data->type = TCL_STDIN;
 	consoleChannel = Tcl_CreateChannel(&consoleChannelType, "console0",
-		(ClientData) data, TCL_READABLE);
+		data, TCL_READABLE);
 	if (consoleChannel != NULL) {
-	    Tcl_SetChannelOption(NULL, consoleChannel,
-		    "-translation", "lf");
-	    Tcl_SetChannelOption(NULL, consoleChannel,
-		    "-buffering", "none");
-	    Tcl_SetChannelOption(NULL, consoleChannel,
-		    "-encoding", "utf-8");
+	    Tcl_SetChannelOption(NULL, consoleChannel, "-translation", "lf");
+	    Tcl_SetChannelOption(NULL, consoleChannel, "-buffering", "none");
+	    Tcl_SetChannelOption(NULL, consoleChannel, "-encoding", "utf-8");
 	}
 	Tcl_SetStdChannel(consoleChannel, TCL_STDIN);
 	Tcl_RegisterChannel(NULL, consoleChannel);
@@ -287,18 +289,16 @@ Tk_InitConsoleChannels(
 
     if (doOut) {
 	ChannelData *data = (ChannelData *) ckalloc(sizeof(ChannelData));
+
 	data->info = info;
 	data->info->refCount++;
 	data->type = TCL_STDOUT;
 	consoleChannel = Tcl_CreateChannel(&consoleChannelType, "console1",
-		(ClientData) data, TCL_WRITABLE);
+		data, TCL_WRITABLE);
 	if (consoleChannel != NULL) {
-	    Tcl_SetChannelOption(NULL, consoleChannel,
-		    "-translation", "lf");
-	    Tcl_SetChannelOption(NULL, consoleChannel,
-		    "-buffering", "none");
-	    Tcl_SetChannelOption(NULL, consoleChannel,
-		    "-encoding", "utf-8");
+	    Tcl_SetChannelOption(NULL, consoleChannel, "-translation", "lf");
+	    Tcl_SetChannelOption(NULL, consoleChannel, "-buffering", "none");
+	    Tcl_SetChannelOption(NULL, consoleChannel, "-encoding", "utf-8");
 	}
 	Tcl_SetStdChannel(consoleChannel, TCL_STDOUT);
 	Tcl_RegisterChannel(NULL, consoleChannel);
@@ -306,18 +306,16 @@ Tk_InitConsoleChannels(
 
     if (doErr) {
 	ChannelData *data = (ChannelData *) ckalloc(sizeof(ChannelData));
+
 	data->info = info;
 	data->info->refCount++;
 	data->type = TCL_STDERR;
 	consoleChannel = Tcl_CreateChannel(&consoleChannelType, "console2",
-		(ClientData) data, TCL_WRITABLE);
+		data, TCL_WRITABLE);
 	if (consoleChannel != NULL) {
-	    Tcl_SetChannelOption(NULL, consoleChannel,
-		    "-translation", "lf");
-	    Tcl_SetChannelOption(NULL, consoleChannel,
-		    "-buffering", "none");
-	    Tcl_SetChannelOption(NULL, consoleChannel,
-		    "-encoding", "utf-8");
+	    Tcl_SetChannelOption(NULL, consoleChannel, "-translation", "lf");
+	    Tcl_SetChannelOption(NULL, consoleChannel, "-buffering", "none");
+	    Tcl_SetChannelOption(NULL, consoleChannel, "-encoding", "utf-8");
 	}
 	Tcl_SetStdChannel(consoleChannel, TCL_STDERR);
 	Tcl_RegisterChannel(NULL, consoleChannel);
@@ -378,7 +376,7 @@ Tk_CreateConsoleWindow(
     }
 
     if (haveConsoleChannel) {
-	ChannelData *data = (ChannelData *)Tcl_GetChannelInstanceData(chan);
+	ChannelData *data = (ChannelData *) Tcl_GetChannelInstanceData(chan);
 	info = data->info;
 	if (info->consoleInterp) {
 	    /* New ConsoleInfo for a new console window */
@@ -388,21 +386,21 @@ Tk_CreateConsoleWindow(
 	    /* Update any console channels to make use of the new console */
 	    if (Tcl_GetChannelType(chan = Tcl_GetStdChannel(TCL_STDIN))
 		    == &consoleChannelType) {
-		data = (ChannelData *)Tcl_GetChannelInstanceData(chan);
+		data = (ChannelData *) Tcl_GetChannelInstanceData(chan);
 		data->info->refCount--;
 		data->info = info;
 		data->info->refCount++;
 	    }
 	    if (Tcl_GetChannelType(chan = Tcl_GetStdChannel(TCL_STDOUT))
 		    == &consoleChannelType) {
-		data = (ChannelData *)Tcl_GetChannelInstanceData(chan);
+		data = (ChannelData *) Tcl_GetChannelInstanceData(chan);
 		data->info->refCount--;
 		data->info = info;
 		data->info->refCount++;
 	    }
 	    if (Tcl_GetChannelType(chan = Tcl_GetStdChannel(TCL_STDERR))
 		    == &consoleChannelType) {
-		data = (ChannelData *)Tcl_GetChannelInstanceData(chan);
+		data = (ChannelData *) Tcl_GetChannelInstanceData(chan);
 		data->info->refCount--;
 		data->info = info;
 		data->info->refCount++;
@@ -416,17 +414,16 @@ Tk_CreateConsoleWindow(
     info->consoleInterp = consoleInterp;
     info->interp = interp;
 
-    Tcl_CallWhenDeleted(consoleInterp, InterpDeleteProc, (ClientData) info);
+    Tcl_CallWhenDeleted(consoleInterp, InterpDeleteProc, info);
     info->refCount++;
-    Tcl_CreateThreadExitHandler(DeleteConsoleInterp,
-	    (ClientData) consoleInterp);
+    Tcl_CreateThreadExitHandler(DeleteConsoleInterp, consoleInterp);
 
     /*
      * Add console commands to the interp
      */
 
-    token = Tcl_CreateObjCommand(interp, "console", ConsoleObjCmd,
-	    (ClientData) info, ConsoleDeleteProc);
+    token = Tcl_CreateObjCommand(interp, "console", ConsoleObjCmd, info,
+	    ConsoleDeleteProc);
     info->refCount++;
 
     /*
@@ -435,29 +432,29 @@ Tk_CreateConsoleWindow(
      * handler takes care of us.
      */
     Tcl_CreateObjCommand(consoleInterp, "consoleinterp", InterpreterObjCmd,
-	    (ClientData) info, NULL);
+	    info, NULL);
 
     mainWindow = Tk_MainWindow(interp);
     if (mainWindow) {
 	Tk_CreateEventHandler(mainWindow, StructureNotifyMask,
-		ConsoleEventProc, (ClientData) info);
+		ConsoleEventProc, info);
 	info->refCount++;
     }
 
-    Tcl_Preserve((ClientData) consoleInterp);
+    Tcl_Preserve(consoleInterp);
     result = Tcl_GlobalEval(consoleInterp, "source $tk_library/console.tcl");
     if (result == TCL_ERROR) {
 	Tcl_SetReturnOptions(interp,
 		Tcl_GetReturnOptions(consoleInterp, result));
 	Tcl_SetObjResult(interp, Tcl_GetObjResult(consoleInterp));
     }
-    Tcl_Release((ClientData) consoleInterp);
+    Tcl_Release(consoleInterp);
     if (result == TCL_ERROR) {
 	Tcl_DeleteCommandFromToken(interp, token);
 	mainWindow = Tk_MainWindow(interp);
 	if (mainWindow) {
 	    Tk_DeleteEventHandler(mainWindow, StructureNotifyMask,
-		    ConsoleEventProc, (ClientData) info);
+		    ConsoleEventProc, info);
 	    if (--info->refCount <= 0) {
 		ckfree((char *) info);
 	    }
@@ -466,7 +463,7 @@ Tk_CreateConsoleWindow(
     }
     return TCL_OK;
 
-    error:
+  error:
     Tcl_AddErrorInfo(interp, "\n    (creating console window)");
     if (!Tcl_InterpDeleted(consoleInterp)) {
 	Tcl_DeleteInterp(consoleInterp);
@@ -495,11 +492,11 @@ Tk_CreateConsoleWindow(
 static int
 ConsoleOutput(
     ClientData instanceData,	/* Indicates which device to use. */
-    CONST char *buf,		/* The data buffer. */
+    const char *buf,		/* The data buffer. */
     int toWrite,		/* How many bytes to write? */
     int *errorCode)		/* Where to store error code. */
 {
-    ChannelData *data = (ChannelData *)instanceData;
+    ChannelData *data = instanceData;
     ConsoleInfo *info = data->info;
 
     *errorCode = 0;
@@ -510,6 +507,7 @@ ConsoleOutput(
 
 	if (consoleInterp && !Tcl_InterpDeleted(consoleInterp)) {
 	    Tcl_Obj *cmd = Tcl_NewStringObj("tk::ConsoleOutput", -1);
+
 	    if (data->type == TCL_STDERR) {
 		Tcl_ListObjAppendElement(NULL, cmd,
 			Tcl_NewStringObj("stderr", -1));
@@ -517,7 +515,8 @@ ConsoleOutput(
 		Tcl_ListObjAppendElement(NULL, cmd,
 			Tcl_NewStringObj("stdout", -1));
 	    }
-	    Tcl_ListObjAppendElement(NULL, cmd, Tcl_NewStringObj(buf, toWrite));
+	    Tcl_ListObjAppendElement(NULL, cmd,
+		    Tcl_NewStringObj(buf, toWrite));
 	    Tcl_IncrRefCount(cmd);
 	    Tcl_GlobalEvalObj(consoleInterp, cmd);
 	    Tcl_DecrRefCount(cmd);
@@ -576,12 +575,15 @@ ConsoleClose(
     ClientData instanceData,	/* Unused. */
     Tcl_Interp *interp)		/* Unused. */
 {
-    ChannelData *data = (ChannelData *)instanceData;
+    ChannelData *data = instanceData;
     ConsoleInfo *info = data->info;
 
     if (info) {
 	if (--info->refCount <= 0) {
-	    /* Assuming the Tcl_Interp * fields must already be NULL */
+	    /*
+	     * Assuming the Tcl_Interp * fields must already be NULL.
+	     */
+
 	    ckfree((char *) info);
 	}
     }
@@ -668,10 +670,10 @@ ConsoleObjCmd(
     ClientData clientData,	/* Access to the console interp */
     Tcl_Interp *interp,		/* Current interpreter */
     int objc,			/* Number of arguments */
-    Tcl_Obj *CONST objv[])	/* Argument objects */
+    Tcl_Obj *const objv[])	/* Argument objects */
 {
     int index, result;
-    static CONST char *options[] = {"eval", "hide", "show", "title", NULL};
+    static const char *options[] = {"eval", "hide", "show", "title", NULL};
     enum option {CON_EVAL, CON_HIDE, CON_SHOW, CON_TITLE};
     Tcl_Obj *cmd = NULL;
     ConsoleInfo *info = (ConsoleInfo *) clientData;
@@ -722,12 +724,12 @@ ConsoleObjCmd(
 
     Tcl_IncrRefCount(cmd);
     if (consoleInterp && !Tcl_InterpDeleted(consoleInterp)) {
-	Tcl_Preserve((ClientData) consoleInterp);
+	Tcl_Preserve(consoleInterp);
 	result = Tcl_GlobalEvalObj(consoleInterp, cmd);
 	Tcl_SetReturnOptions(interp,
 		Tcl_GetReturnOptions(consoleInterp, result));
 	Tcl_SetObjResult(interp, Tcl_GetObjResult(consoleInterp));
-	Tcl_Release((ClientData) consoleInterp);
+	Tcl_Release(consoleInterp);
     } else {
 	Tcl_AppendResult(interp, "no active console interp", NULL);
 	result = TCL_ERROR;
@@ -755,12 +757,12 @@ InterpreterObjCmd(
     ClientData clientData,	/* */
     Tcl_Interp *interp,		/* Current interpreter */
     int objc,			/* Number of arguments */
-    Tcl_Obj *CONST objv[])	/* Argument objects */
+    Tcl_Obj *const objv[])	/* Argument objects */
 {
     int index, result = TCL_OK;
-    static CONST char *options[] = {"eval", "record", NULL};
+    static const char *options[] = {"eval", "record", NULL};
     enum option {OTHER_EVAL, OTHER_RECORD};
-    ConsoleInfo *info = (ConsoleInfo *) clientData;
+    ConsoleInfo *info = clientData;
     Tcl_Interp *otherInterp = info->interp;
 
     if (objc < 2) {
@@ -782,28 +784,32 @@ InterpreterObjCmd(
 	return TCL_ERROR;
     }
 
-    Tcl_Preserve((ClientData) otherInterp);
+    Tcl_Preserve(otherInterp);
     switch ((enum option) index) {
     case OTHER_EVAL:
    	result = Tcl_GlobalEvalObj(otherInterp, objv[2]);
+
 	/*
 	 * TODO: Should exceptions be filtered here?
 	 */
+
 	Tcl_SetReturnOptions(interp,
 		Tcl_GetReturnOptions(otherInterp, result));
 	Tcl_SetObjResult(interp, Tcl_GetObjResult(otherInterp));
 	break;
     case OTHER_RECORD:
    	Tcl_RecordAndEvalObj(otherInterp, objv[2], TCL_EVAL_GLOBAL);
+
 	/*
-	 * By not setting result, we discard any exceptions or errors here
-	 * and always return TCL_OK.  All the caller wants is the
-	 * interp result to display, whether that's result or error message.
+	 * By not setting result, we discard any exceptions or errors here and
+	 * always return TCL_OK. All the caller wants is the interp result to
+	 * display, whether that's result or error message.
 	 */
+
 	Tcl_SetObjResult(interp, Tcl_GetObjResult(otherInterp));
 	break;
     }
-    Tcl_Release((ClientData) otherInterp);
+    Tcl_Release(otherInterp);
     return result;
 }
 
@@ -812,8 +818,8 @@ InterpreterObjCmd(
  *
  * DeleteConsoleInterp --
  *
- *	Thread exit handler to destroy a console interp when the
- *	thread it lives in gets torn down.
+ *	Thread exit handler to destroy a console interp when the thread it
+ *	lives in gets torn down.
  *
  *----------------------------------------------------------------------
  */
@@ -822,7 +828,8 @@ static void
 DeleteConsoleInterp(
     ClientData clientData)
 {
-    Tcl_Interp *interp = (Tcl_Interp *)clientData;
+    Tcl_Interp *interp = clientData;
+
     Tcl_DeleteInterp(interp);
 }
 
@@ -831,8 +838,8 @@ DeleteConsoleInterp(
  *
  * InterpDeleteProc --
  *
- *	React when the interp in which the console is displayed is deleted
- *	for any reason.
+ *	React when the interp in which the console is displayed is deleted for
+ *	any reason.
  *
  * Results:
  *	None.
@@ -848,11 +855,10 @@ InterpDeleteProc(
     ClientData clientData,
     Tcl_Interp *interp)
 {
-    ConsoleInfo *info = (ConsoleInfo *) clientData;
+    ConsoleInfo *info = clientData;
 
     if (info->consoleInterp == interp) {
-	Tcl_DeleteThreadExitHandler(DeleteConsoleInterp,
-		(ClientData) info->consoleInterp);
+	Tcl_DeleteThreadExitHandler(DeleteConsoleInterp, info->consoleInterp);
 	info->consoleInterp = NULL;
     }
     if (--info->refCount <= 0) {
@@ -881,7 +887,7 @@ static void
 ConsoleDeleteProc(
     ClientData clientData)
 {
-    ConsoleInfo *info = (ConsoleInfo *) clientData;
+    ConsoleInfo *info = clientData;
 
     if (info->consoleInterp) {
 	Tcl_DeleteInterp(info->consoleInterp);
@@ -916,7 +922,7 @@ ConsoleEventProc(
     XEvent *eventPtr)
 {
     if (eventPtr->type == DestroyNotify) {
-	ConsoleInfo *info = (ConsoleInfo *) clientData;
+	ConsoleInfo *info = clientData;
 	Tcl_Interp *consoleInterp = info->consoleInterp;
 
 	if (consoleInterp && !Tcl_InterpDeleted(consoleInterp)) {