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

13 files changed, 285 insertions, 273 deletions

diff --git a/unix/tclAppInit.c b/unix/tclAppInit.c
index a5058d8..4183c7c 100644
--- a/unix/tclAppInit.c
+++ b/unix/tclAppInit.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: tclAppInit.c,v 1.17 2007/04/16 13:36:35 dkf Exp $
+ * RCS: @(#) $Id: tclAppInit.c,v 1.18 2008/04/27 22:21:33 dkf Exp $
  */
 
 #include "tcl.h"
@@ -28,8 +28,8 @@ extern Tcl_PackageInitProc	Tcltest_Init;
 #endif /* TCL_TEST */
 
 #ifdef TCL_XT_TEST
-extern void		XtToolkitInitialize _ANSI_ARGS_((void));
-extern int		Tclxttest_Init _ANSI_ARGS_((Tcl_Interp *interp));
+extern void		XtToolkitInitialize(void);
+extern int		Tclxttest_Init(Tcl_Interp *interp);
 #endif
 
 /*
@@ -64,7 +64,7 @@ main(
 #ifndef TCL_LOCAL_APPINIT
 #define TCL_LOCAL_APPINIT Tcl_AppInit
 #endif
-    extern int TCL_LOCAL_APPINIT _ANSI_ARGS_((Tcl_Interp *interp));
+    extern int TCL_LOCAL_APPINIT(Tcl_Interp *interp);
 
     /*
      * The following #if block allows you to change how Tcl finds the startup
@@ -73,7 +73,7 @@ main(
      */
 
 #ifdef TCL_LOCAL_MAIN_HOOK
-    extern int TCL_LOCAL_MAIN_HOOK _ANSI_ARGS_((int *argc, char ***argv));
+    extern int TCL_LOCAL_MAIN_HOOK(int *argc, char ***argv);
 #endif
 
 #ifdef TCL_XT_TEST
diff --git a/unix/tclLoadDl.c b/unix/tclLoadDl.c
index d92dc04..7bb1da3 100644
--- a/unix/tclLoadDl.c
+++ b/unix/tclLoadDl.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: tclLoadDl.c,v 1.16 2006/06/13 22:10:19 dkf Exp $
+ * RCS: @(#) $Id: tclLoadDl.c,v 1.17 2008/04/27 22:21:33 dkf Exp $
  */
 
 #include "tclInt.h"
@@ -66,7 +66,7 @@ TclpDlopen(
 				 * file. */
 {
     void *handle;
-    CONST char *native;
+    const char *native;
 
     /*
      * First try the full path the user gave us. This is particularly
@@ -129,11 +129,11 @@ Tcl_PackageInitProc *
 TclpFindSymbol(
     Tcl_Interp *interp,		/* Place to put error messages. */
     Tcl_LoadHandle loadHandle,	/* Value from TcpDlopen(). */
-    CONST char *symbol)		/* Symbol to look up. */
+    const char *symbol)		/* Symbol to look up. */
 {
-    CONST char *native;
+    const char *native;
     Tcl_DString newName, ds;
-    VOID *handle = (VOID*)loadHandle;
+    void *handle = (void *) loadHandle;
     Tcl_PackageInitProc *proc;
 
     /*
@@ -210,7 +210,7 @@ TclpUnloadFile(
 
 int
 TclGuessPackageName(
-    CONST char *fileName,	/* Name of file containing package (already
+    const char *fileName,	/* Name of file containing package (already
 				 * translated to local form if needed). */
     Tcl_DString *bufPtr)	/* Initialized empty dstring. Append package
 				 * name to this if possible. */
diff --git a/unix/tclLoadDyld.c b/unix/tclLoadDyld.c
index dd09749..93d29ab 100644
--- a/unix/tclLoadDyld.c
+++ b/unix/tclLoadDyld.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclLoadDyld.c,v 1.29 2007/12/13 15:28:42 dgp Exp $
+ * RCS: @(#) $Id: tclLoadDyld.c,v 1.30 2008/04/27 22:21:34 dkf Exp $
  */
 
 #include "tclInt.h"
@@ -112,7 +112,7 @@ MODULE_SCOPE long tclMacOSXDarwinRelease;
  *----------------------------------------------------------------------
  */
 
-static CONST char*
+static const char*
 DyldOFIErrorMsg(
     int err)
 {
@@ -346,7 +346,7 @@ MODULE_SCOPE Tcl_PackageInitProc *
 TclpFindSymbol(
     Tcl_Interp *interp,		/* For error reporting. */
     Tcl_LoadHandle loadHandle,	/* Handle from TclpDlopen. */
-    CONST char *symbol)		/* Symbol name to look up. */
+    const char *symbol)		/* Symbol name to look up. */
 {
     Tcl_DyldLoadHandle *dyldLoadHandle = (Tcl_DyldLoadHandle *) loadHandle;
     Tcl_PackageInitProc *proc = NULL;
@@ -528,7 +528,7 @@ TclpUnloadFile(
 
 int
 TclGuessPackageName(
-    CONST char *fileName,	/* Name of file containing package (already
+    const char *fileName,	/* Name of file containing package (already
 				 * translated to local form if needed). */
     Tcl_DString *bufPtr)	/* Initialized empty dstring. Append package
 				 * name to this if possible. */
diff --git a/unix/tclLoadNext.c b/unix/tclLoadNext.c
index 48c7c98..4168ebb 100644
--- a/unix/tclLoadNext.c
+++ b/unix/tclLoadNext.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: tclLoadNext.c,v 1.13 2005/11/11 23:46:34 dkf Exp $
+ * RCS: @(#) $Id: tclLoadNext.c,v 1.14 2008/04/27 22:21:34 dkf Exp $
  */
 
 #include "tclInt.h"
@@ -50,7 +50,7 @@ TclpDlopen(
     struct mach_header *header;
     char *fileName;
     char *files[2];
-    CONST char *native;
+    const char *native;
     int result = 1;
 
     NXStream *errorStream = NXOpenMemory(0,0,NX_READWRITE);
@@ -121,7 +121,7 @@ Tcl_PackageInitProc *
 TclpFindSymbol(
     Tcl_Interp *interp,
     Tcl_LoadHandle loadHandle,
-    CONST char *symbol)
+    const char *symbol)
 {
     Tcl_PackageInitProc *proc = NULL;
     if (symbol) {
@@ -183,7 +183,7 @@ TclpUnloadFile(
 
 int
 TclGuessPackageName(
-    CONST char *fileName,	/* Name of file containing package (already
+    const char *fileName,	/* Name of file containing package (already
 				 * translated to local form if needed). */
     Tcl_DString *bufPtr)	/* Initialized empty dstring. Append package
 				 * name to this if possible. */
diff --git a/unix/tclLoadOSF.c b/unix/tclLoadOSF.c
index c0f67eb..8a63035 100644
--- a/unix/tclLoadOSF.c
+++ b/unix/tclLoadOSF.c
@@ -31,7 +31,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclLoadOSF.c,v 1.13 2005/11/11 23:46:34 dkf Exp $
+ * RCS: @(#) $Id: tclLoadOSF.c,v 1.14 2008/04/27 22:21:34 dkf Exp $
  */
 
 #include "tclInt.h"
@@ -72,7 +72,7 @@ TclpDlopen(
     ldr_module_t lm;
     char *pkg;
     char *fileName = Tcl_GetString(pathPtr);
-    CONST char *native;
+    const char *native;
 
     /*
      * First try the full path the user gave us.  This is particularly
@@ -144,7 +144,7 @@ Tcl_PackageInitProc *
 TclpFindSymbol(
     Tcl_Interp *interp,
     Tcl_LoadHandle loadHandle,
-    CONST char *symbol)
+    const char *symbol)
 {
     return ldr_lookup_package((char *)loadHandle, symbol);
 }
@@ -197,7 +197,7 @@ TclpUnloadFile(
 
 int
 TclGuessPackageName(
-    CONST char *fileName,	/* Name of file containing package (already
+    const char *fileName,	/* Name of file containing package (already
 				 * translated to local form if needed). */
     Tcl_DString *bufPtr)	/* Initialized empty dstring. Append package
 				 * name to this if possible. */
diff --git a/unix/tclLoadShl.c b/unix/tclLoadShl.c
index 80ef7b5..a3a3fc5 100644
--- a/unix/tclLoadShl.c
+++ b/unix/tclLoadShl.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: tclLoadShl.c,v 1.16 2005/11/11 23:46:34 dkf Exp $
+ * RCS: @(#) $Id: tclLoadShl.c,v 1.17 2008/04/27 22:21:34 dkf Exp $
  */
 
 #include <dl.h>
@@ -57,7 +57,7 @@ TclpDlopen(
 				 * file. */
 {
     shl_t handle;
-    CONST char *native;
+    const char *native;
     char *fileName = Tcl_GetString(pathPtr);
 
     /*
@@ -122,7 +122,7 @@ Tcl_PackageInitProc *
 TclpFindSymbol(
     Tcl_Interp *interp,
     Tcl_LoadHandle loadHandle,
-    CONST char *symbol)
+    const char *symbol)
 {
     Tcl_DString newName;
     Tcl_PackageInitProc *proc = NULL;
@@ -199,7 +199,7 @@ TclpUnloadFile(
 
 int
 TclGuessPackageName(
-    CONST char *fileName,	/* Name of file containing package (already
+    const char *fileName,	/* Name of file containing package (already
 				 * translated to local form if needed). */
     Tcl_DString *bufPtr)	/* Initialized empty dstring. Append package
 				 * name to this if possible. */
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c
index 41b1003..1f1cf89 100644
--- a/unix/tclUnixFCmd.c
+++ b/unix/tclUnixFCmd.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: tclUnixFCmd.c,v 1.65 2007/12/13 15:28:42 dgp Exp $
+ * RCS: @(#) $Id: tclUnixFCmd.c,v 1.66 2008/04/27 22:21:34 dkf Exp $
  *
  * Portions of this code were derived from NetBSD source code which has the
  * following copyright notice:
@@ -99,7 +99,7 @@ static int		SetReadOnlyAttribute(Tcl_Interp *interp, int objIndex,
  */
 
 typedef int (TraversalProc)(Tcl_DString *srcPtr, Tcl_DString *dstPtr,
-	CONST Tcl_StatBuf *statBufPtr, int type, Tcl_DString *errorPtr);
+	const Tcl_StatBuf *statBufPtr, int type, Tcl_DString *errorPtr);
 
 /*
  * Constants and variables necessary for file attributes subcommand.
@@ -131,8 +131,8 @@ enum {
     UNIX_INVALID_ATTRIBUTE /* lint - last enum value needs no trailing , */
 };
 
-MODULE_SCOPE CONST char *tclpFileAttrStrings[];
-CONST char *tclpFileAttrStrings[] = {
+MODULE_SCOPE const char *tclpFileAttrStrings[];
+const char *tclpFileAttrStrings[] = {
     "-group", "-owner", "-permissions",
 #if defined(HAVE_CHFLAGS) && defined(UF_IMMUTABLE)
     "-readonly",
@@ -143,8 +143,8 @@ CONST char *tclpFileAttrStrings[] = {
     NULL
 };
 
-MODULE_SCOPE CONST TclFileAttrProcs tclpFileAttrProcs[];
-CONST TclFileAttrProcs tclpFileAttrProcs[] = {
+MODULE_SCOPE const TclFileAttrProcs tclpFileAttrProcs[];
+const TclFileAttrProcs tclpFileAttrProcs[] = {
     {GetGroupAttribute, SetGroupAttribute},
     {GetOwnerAttribute, SetOwnerAttribute},
     {GetPermissionsAttribute, SetPermissionsAttribute},
@@ -179,19 +179,19 @@ CONST TclFileAttrProcs tclpFileAttrProcs[] = {
  * Declarations for local procedures defined in this file:
  */
 
-static int		CopyFileAtts(CONST char *src,
-			    CONST char *dst, CONST Tcl_StatBuf *statBufPtr);
-static int		DoCopyFile(CONST char *srcPtr, CONST char *dstPtr,
-			    CONST Tcl_StatBuf *statBufPtr);
-static int		DoCreateDirectory(CONST char *pathPtr);
+static int		CopyFileAtts(const char *src,
+			    const char *dst, const Tcl_StatBuf *statBufPtr);
+static int		DoCopyFile(const char *srcPtr, const char *dstPtr,
+			    const Tcl_StatBuf *statBufPtr);
+static int		DoCreateDirectory(const char *pathPtr);
 static int		DoRemoveDirectory(Tcl_DString *pathPtr,
 			    int recursive, Tcl_DString *errorPtr);
-static int		DoRenameFile(CONST char *src, CONST char *dst);
+static int		DoRenameFile(const char *src, const char *dst);
 static int		TraversalCopy(Tcl_DString *srcPtr,
-			    Tcl_DString *dstPtr, CONST Tcl_StatBuf *statBufPtr,
+			    Tcl_DString *dstPtr, const Tcl_StatBuf *statBufPtr,
 			    int type, Tcl_DString *errorPtr);
 static int		TraversalDelete(Tcl_DString *srcPtr,
-			    Tcl_DString *dstPtr, CONST Tcl_StatBuf *statBufPtr,
+			    Tcl_DString *dstPtr, const Tcl_StatBuf *statBufPtr,
 			    int type, Tcl_DString *errorPtr);
 static int		TraverseUnixTree(TraversalProc *traversalProc,
 			    Tcl_DString *sourcePtr, Tcl_DString *destPtr,
@@ -205,11 +205,11 @@ static int		TraverseUnixTree(TraversalProc *traversalProc,
  * passing the standard MAXPATHLEN size resolved arg.
  */
 
-static char *		Realpath(CONST char *path, char *resolved);
+static char *		Realpath(const char *path, char *resolved);
 
 char *
 Realpath(
-    CONST char *path,
+    const char *path,
     char *resolved)
 {
     memset(resolved, 0, MAXPATHLEN);
@@ -301,9 +301,9 @@ TclpObjRenameFile(
 
 static int
 DoRenameFile(
-    CONST char *src,		/* Pathname of file or dir to be renamed
+    const char *src,		/* Pathname of file or dir to be renamed
 				 * (native). */
-    CONST char *dst)		/* New pathname of file or directory
+    const char *dst)		/* New pathname of file or directory
 				 * (native). */
 {
     if (rename(src, dst) == 0) {			/* INTL: Native. */
@@ -411,7 +411,7 @@ TclpObjCopyFile(
     Tcl_Obj *srcPathPtr,
     Tcl_Obj *destPathPtr)
 {
-    CONST char *src = Tcl_FSGetNativePath(srcPathPtr);
+    const char *src = Tcl_FSGetNativePath(srcPathPtr);
     Tcl_StatBuf srcStatBuf;
 
     if (TclOSlstat(src, &srcStatBuf) != 0) {		/* INTL: Native. */
@@ -423,9 +423,9 @@ TclpObjCopyFile(
 
 static int
 DoCopyFile(
-    CONST char *src,		/* Pathname of file to be copied (native). */
-    CONST char *dst,		/* Pathname of file to copy to (native). */
-    CONST Tcl_StatBuf *statBufPtr)
+    const char *src,		/* Pathname of file to be copied (native). */
+    const char *dst,		/* Pathname of file to copy to (native). */
+    const Tcl_StatBuf *statBufPtr)
 				/* Used to determine filetype. */
 {
     Tcl_StatBuf dstStatBuf;
@@ -509,10 +509,10 @@ DoCopyFile(
 
 int
 TclUnixCopyFile(
-    CONST char *src,		/* Pathname of file to copy (native). */
-    CONST char *dst,		/* Pathname of file to create/overwrite
+    const char *src,		/* Pathname of file to copy (native). */
+    const char *dst,		/* Pathname of file to create/overwrite
 				 * (native). */
-    CONST Tcl_StatBuf *statBufPtr,
+    const Tcl_StatBuf *statBufPtr,
 				/* Used to determine mode and blocksize. */
     int dontCopyAtts)		/* If flag set, don't copy attributes. */
 {
@@ -631,7 +631,7 @@ TclpObjDeleteFile(
 
 int
 TclpDeleteFile(
-    CONST char *path)		/* Pathname of file to be removed (native). */
+    const char *path)		/* Pathname of file to be removed (native). */
 {
     if (unlink(path) != 0) {				/* INTL: Native. */
 	return TCL_ERROR;
@@ -674,7 +674,7 @@ TclpObjCreateDirectory(
 
 static int
 DoCreateDirectory(
-    CONST char *path)		/* Pathname of directory to create (native). */
+    const char *path)		/* Pathname of directory to create (native). */
 {
     mode_t mode;
 
@@ -821,7 +821,7 @@ DoRemoveDirectory(
 				 * filled with UTF-8 name of file causing
 				 * error. */
 {
-    CONST char *path;
+    const char *path;
     mode_t oldPerm = 0;
     int result;
 
@@ -919,7 +919,7 @@ TraverseUnixTree(
     				 * files. */
 {
     Tcl_StatBuf statBuf;
-    CONST char *source, *errfile;
+    const char *source, *errfile;
     int result, sourceLen;
     int targetLen;
 #ifndef HAVE_FTS
@@ -927,7 +927,7 @@ TraverseUnixTree(
     Tcl_DirEntry *dirEntPtr;
     DIR *dirPtr;
 #else
-    CONST char *paths[2] = {NULL, NULL};
+    const char *paths[2] = {NULL, NULL};
     FTS *fts = NULL;
     FTSENT *ent;
 #endif
@@ -1137,7 +1137,7 @@ static int
 TraversalCopy(
     Tcl_DString *srcPtr,	/* Source pathname to copy (native). */
     Tcl_DString *dstPtr,	/* Destination pathname of copy (native). */
-    CONST Tcl_StatBuf *statBufPtr,
+    const Tcl_StatBuf *statBufPtr,
 				/* Stat info for file specified by srcPtr. */
     int type,			/* Reason for call - see TraverseUnixTree(). */
     Tcl_DString *errorPtr)	/* If non-NULL, uninitialized or free DString
@@ -1201,7 +1201,7 @@ static int
 TraversalDelete(
     Tcl_DString *srcPtr,	/* Source pathname (native). */
     Tcl_DString *ignore,	/* Destination pathname (not used). */
-    CONST Tcl_StatBuf *statBufPtr,
+    const Tcl_StatBuf *statBufPtr,
 				/* Stat info for file specified by srcPtr. */
     int type,			/* Reason for call - see TraverseUnixTree(). */
     Tcl_DString *errorPtr)	/* If non-NULL, uninitialized or free DString
@@ -1249,9 +1249,9 @@ TraversalDelete(
 
 static int
 CopyFileAtts(
-    CONST char *src,		/* Path name of source file (native). */
-    CONST char *dst,		/* Path name of target file (native). */
-    CONST Tcl_StatBuf *statBufPtr)
+    const char *src,		/* Path name of source file (native). */
+    const char *dst,		/* Path name of target file (native). */
+    const Tcl_StatBuf *statBufPtr)
 				/* Stat info for source file */
 {
     struct utimbuf tval;
@@ -1332,7 +1332,7 @@ GetGroupAttribute(
 	*attributePtrPtr = Tcl_NewIntObj((int) statBuf.st_gid);
     } else {
 	Tcl_DString ds;
-	CONST char *utf;
+	const char *utf;
 
 	utf = Tcl_ExternalToUtfDString(NULL, groupPtr->gr_name, -1, &ds);
 	*attributePtrPtr = Tcl_NewStringObj(utf, -1);
@@ -1387,7 +1387,7 @@ GetOwnerAttribute(
 	*attributePtrPtr = Tcl_NewIntObj((int) statBuf.st_uid);
     } else {
 	Tcl_DString ds;
-	CONST char *utf;
+	const char *utf;
 
 	utf = Tcl_ExternalToUtfDString(NULL, pwPtr->pw_name, -1, &ds);
 	*attributePtrPtr = Tcl_NewStringObj(utf, Tcl_DStringLength(&ds));
@@ -1465,12 +1465,12 @@ SetGroupAttribute(
 {
     long gid;
     int result;
-    CONST char *native;
+    const char *native;
 
     if (Tcl_GetLongFromObj(NULL, attributePtr, &gid) != TCL_OK) {
 	Tcl_DString ds;
 	struct group *groupPtr = NULL;
-	CONST char *string;
+	const char *string;
 	int length;
 
 	string = Tcl_GetStringFromObj(attributePtr, &length);
@@ -1531,12 +1531,12 @@ SetOwnerAttribute(
 {
     long uid;
     int result;
-    CONST char *native;
+    const char *native;
 
     if (Tcl_GetLongFromObj(NULL, attributePtr, &uid) != TCL_OK) {
 	Tcl_DString ds;
 	struct passwd *pwPtr = NULL;
-	CONST char *string;
+	const char *string;
 	int length;
 
 	string = Tcl_GetStringFromObj(attributePtr, &length);
@@ -1596,7 +1596,7 @@ SetPermissionsAttribute(
     long mode;
     mode_t newMode;
     int result = TCL_ERROR;
-    CONST char *native;
+    const char *native;
     char *modeStringPtr = TclGetString(attributePtr);
     int scanned = TclParseAllWhiteSpace(modeStringPtr, -1);
 
@@ -1909,7 +1909,7 @@ TclpObjNormalizePath(
 #ifndef NO_REALPATH
     char normPath[MAXPATHLEN];
     Tcl_DString ds;
-    CONST char *nativePath;
+    const char *nativePath;
 #endif
 
     /*
@@ -1962,7 +1962,7 @@ TclpObjNormalizePath(
 	     */
 
 	    Tcl_DString ds;
-	    CONST char *nativePath;
+	    const char *nativePath;
 	    int accessOk;
 
 	    nativePath = Tcl_UtfToExternalDString(NULL, path,
@@ -2156,9 +2156,8 @@ SetReadOnlyAttribute(
     Tcl_Obj *attributePtr)	/* The attribute to set. */
 {
     Tcl_StatBuf statBuf;
-    int result;
-    int readonly;
-    CONST char *native;
+    int result, readonly;
+    const char *native;
 
     if (Tcl_GetBooleanFromObj(interp, attributePtr, &readonly) != TCL_OK) {
 	return TCL_ERROR;
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c
index d11b43c..a24966c 100644
--- a/unix/tclUnixFile.c
+++ b/unix/tclUnixFile.c
@@ -9,14 +9,14 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclUnixFile.c,v 1.52 2007/12/13 15:28:42 dgp Exp $
+ * RCS: @(#) $Id: tclUnixFile.c,v 1.53 2008/04/27 22:21:34 dkf Exp $
  */
 
 #include "tclInt.h"
 #include "tclFileSystem.h"
 
-static int NativeMatchType(Tcl_Interp *interp, CONST char* nativeEntry,
-	CONST char* nativeName, Tcl_GlobTypeData *types);
+static int NativeMatchType(Tcl_Interp *interp, const char* nativeEntry,
+	const char* nativeName, Tcl_GlobTypeData *types);
 
 /*
  *---------------------------------------------------------------------------
@@ -37,10 +37,10 @@ static int NativeMatchType(Tcl_Interp *interp, CONST char* nativeEntry,
 
 void
 TclpFindExecutable(
-    CONST char *argv0)		/* The value of the application's argv[0]
+    const char *argv0)		/* The value of the application's argv[0]
 				 * (native). */
 {
-    CONST char *name, *p;
+    const char *name, *p;
     Tcl_StatBuf statBuf;
     Tcl_DString buffer, nameString, cwd, utfName;
     Tcl_Encoding encoding;
@@ -202,12 +202,12 @@ TclpMatchInDirectory(
     Tcl_Interp *interp,		/* Interpreter to receive errors. */
     Tcl_Obj *resultPtr,		/* List object to lappend results. */
     Tcl_Obj *pathPtr,		/* Contains path to directory to search. */
-    CONST char *pattern,	/* Pattern to match against. */
+    const char *pattern,	/* Pattern to match against. */
     Tcl_GlobTypeData *types)	/* Object containing list of acceptable types.
 				 * May be NULL. In particular the directory
 				 * flag is very important. */
 {
-    CONST char *native;
+    const char *native;
     Tcl_Obj *fileNamePtr;
     int matchResult = 0;
 
@@ -228,12 +228,13 @@ TclpMatchInDirectory(
 	/*
 	 * Match a file directly.
 	 */
+
 	Tcl_Obj *tailPtr;
-	CONST char *nativeTail;
+	const char *nativeTail;
 
-	native = (CONST char*) Tcl_FSGetNativePath(pathPtr);
+	native = (const char *) Tcl_FSGetNativePath(pathPtr);
 	tailPtr = TclPathPart(interp, pathPtr, TCL_PATH_TAIL);
-	nativeTail = (CONST char*) Tcl_FSGetNativePath(tailPtr);
+	nativeTail = (const char *) Tcl_FSGetNativePath(tailPtr);
 	matchResult = NativeMatchType(interp, native, nativeTail, types);
 	if (matchResult == 1) {
 	    Tcl_ListObjAppendElement(interp, resultPtr, pathPtr);
@@ -243,10 +244,9 @@ TclpMatchInDirectory(
     } else {
 	DIR *d;
 	Tcl_DirEntry *entryPtr;
-	CONST char *dirName;
-	int dirLength;
+	const char *dirName;
+	int dirLength, nativeDirLen;
 	int matchHidden, matchHiddenPat;
-	int nativeDirLen;
 	Tcl_StatBuf statBuf;
 	Tcl_DString ds;		/* native encoding of dir */
 	Tcl_DString dsOrig;	/* utf-8 encoding of dir */
@@ -257,7 +257,7 @@ TclpMatchInDirectory(
 
 	/*
 	 * Make sure that the directory part of the name really is a
-	 * directory.  If the directory name is "", use the name "." instead,
+	 * directory. If the directory name is "", use the name "." instead,
 	 * because some UNIX systems don't treat "" like "." automatically.
 	 * Keep the "" for use in generating file names, otherwise "glob
 	 * foo.c" would return "./foo.c".
@@ -299,7 +299,7 @@ TclpMatchInDirectory(
 		Tcl_ResetResult(interp);
 		Tcl_AppendResult(interp, "couldn't read directory \"",
 			Tcl_DStringValue(&dsOrig), "\": ",
-			Tcl_PosixError(interp), (char *) NULL);
+			Tcl_PosixError(interp), NULL);
 	    }
 	    Tcl_DStringFree(&dsOrig);
 	    Tcl_DecrRefCount(fileNamePtr);
@@ -318,7 +318,7 @@ TclpMatchInDirectory(
 		|| (types && (types->perm & TCL_GLOB_PERM_HIDDEN));
 	while ((entryPtr = TclOSreaddir(d)) != NULL) {	/* INTL: Native. */
 	    Tcl_DString utfDs;
-	    CONST char *utfname;
+	    const char *utfname;
 
 	    /*
 	     * Skip this file if it doesn't agree with the hidden parameters
@@ -326,13 +326,19 @@ TclpMatchInDirectory(
 	     */
 
 	    if (*entryPtr->d_name == '.') {
-		if (!matchHidden) continue;
+		if (!matchHidden) {
+		    continue;
+		}
 	    } else {
 #ifdef MAC_OSX_TCL
-		if (matchHiddenPat) continue;
+		if (matchHiddenPat) {
+		    continue;
+		}
 		/* Also need to check HFS hidden flag in TclMacOSXMatchType. */
 #else
-		if (matchHidden) continue;
+		if (matchHidden) {
+		    continue;
+		}
 #endif
 	    }
 
@@ -372,9 +378,8 @@ TclpMatchInDirectory(
     }
     if (matchResult < 0) {
 	return TCL_ERROR;
-    } else {
-	return TCL_OK;
     }
+    return TCL_OK;
 }
 
 /*
@@ -382,13 +387,13 @@ TclpMatchInDirectory(
  *
  * NativeMatchType --
  *
- *	This routine is used by the globbing code to check if a file
- *	matches a given type description.
+ *	This routine is used by the globbing code to check if a file matches a
+ *	given type description.
  *
  * Results:
- *	The return value is 1, 0 or -1 indicating whether the file
- *	matches the given criteria, does not match them, or an error
- *	occurred (in wich case an error is left in interp).
+ *	The return value is 1, 0 or -1 indicating whether the file matches the
+ *	given criteria, does not match them, or an error occurred (in which
+ *	case an error is left in interp).
  *
  * Side effects:
  *	None.
@@ -399,11 +404,12 @@ TclpMatchInDirectory(
 static int
 NativeMatchType(
     Tcl_Interp *interp,       /* Interpreter to receive errors. */
-    CONST char *nativeEntry,  /* Native path to check. */
-    CONST char *nativeName,   /* Native filename to check. */
+    const char *nativeEntry,  /* Native path to check. */
+    const char *nativeName,   /* Native filename to check. */
     Tcl_GlobTypeData *types)  /* Type description to match against. */
 {
     Tcl_StatBuf buf;
+
     if (types == NULL) {
 	/*
 	 * Simply check for the file's existence, but do it with lstat, in
@@ -414,124 +420,130 @@ NativeMatchType(
 	if (TclOSlstat(nativeEntry, &buf) != 0) {
 	    return 0;
 	}
-    } else {
-	if (types->perm != 0) {
-	    if (TclOSstat(nativeEntry, &buf) != 0) {
-		/*
-		 * Either the file has disappeared between the 'readdir' call
-		 * and the 'stat' call, or the file is a link to a file which
-		 * doesn't exist (which we could ascertain with lstat), or
-		 * there is some other strange problem. In all these cases, we
-		 * define this to mean the file does not match any defined
-		 * permission, and therefore it is not added to the list of
-		 * files to return.
-		 */
-
-		return 0;
-	    }
+	return 1;
+    }
 
+    if (types->perm != 0) {
+	if (TclOSstat(nativeEntry, &buf) != 0) {
 	    /*
-	     * readonly means that there are NO write permissions (even for
-	     * user), but execute is OK for anybody OR that the user immutable
-	     * flag is set (where supported).
+	     * Either the file has disappeared between the 'readdir' call and
+	     * the 'stat' call, or the file is a link to a file which doesn't
+	     * exist (which we could ascertain with lstat), or there is some
+	     * other strange problem. In all these cases, we define this to
+	     * mean the file does not match any defined permission, and
+	     * therefore it is not added to the list of files to return.
 	     */
 
-	    if (((types->perm & TCL_GLOB_PERM_RONLY) &&
+	    return 0;
+	}
+
+	/*
+	 * readonly means that there are NO write permissions (even for user),
+	 * but execute is OK for anybody OR that the user immutable flag is
+	 * set (where supported).
+	 */
+
+	if (((types->perm & TCL_GLOB_PERM_RONLY) &&
 #if defined(HAVE_CHFLAGS) && defined(UF_IMMUTABLE)
-			!(buf.st_flags & UF_IMMUTABLE) &&
+		!(buf.st_flags & UF_IMMUTABLE) &&
 #endif
-			(buf.st_mode & (S_IWOTH|S_IWGRP|S_IWUSR))) ||
-		((types->perm & TCL_GLOB_PERM_R) &&
-			(access(nativeEntry, R_OK) != 0)) ||
-		((types->perm & TCL_GLOB_PERM_W) &&
-			(access(nativeEntry, W_OK) != 0)) ||
-		((types->perm & TCL_GLOB_PERM_X) &&
-			(access(nativeEntry, X_OK) != 0))
+		(buf.st_mode & (S_IWOTH|S_IWGRP|S_IWUSR))) ||
+	    ((types->perm & TCL_GLOB_PERM_R) &&
+		(access(nativeEntry, R_OK) != 0)) ||
+	    ((types->perm & TCL_GLOB_PERM_W) &&
+		(access(nativeEntry, W_OK) != 0)) ||
+	    ((types->perm & TCL_GLOB_PERM_X) &&
+		(access(nativeEntry, X_OK) != 0))
 #ifndef MAC_OSX_TCL
-		|| ((types->perm & TCL_GLOB_PERM_HIDDEN) &&
-			(*nativeName != '.'))
+	    || ((types->perm & TCL_GLOB_PERM_HIDDEN) &&
+		(*nativeName != '.'))
 #endif
 		) {
-		return 0;
-	    }
+	    return 0;
 	}
-	if (types->type != 0) {
-	    if (types->perm == 0) {
+    }
+    if (types->type != 0) {
+	if (types->perm == 0) {
+	    /*
+	     * We haven't yet done a stat on the file.
+	     */
+
+	    if (TclOSstat(nativeEntry, &buf) != 0) {
 		/*
-		 * We haven't yet done a stat on the file.
+		 * Posix error occurred. The only ok case is if this is a link
+		 * to a nonexistent file, and the user did 'glob -l'. So we
+		 * check that here:
 		 */
 
-		if (TclOSstat(nativeEntry, &buf) != 0) {
-		    /*
-		     * Posix error occurred. The only ok case is if this is a
-		     * link to a nonexistent file, and the user did 'glob -l'.
-		     * So we check that here:
-		     */
-
-		    if (types->type & TCL_GLOB_TYPE_LINK) {
-			if (TclOSlstat(nativeEntry, &buf) == 0) {
-			    if (S_ISLNK(buf.st_mode)) {
-				return 1;
-			    }
+		if (types->type & TCL_GLOB_TYPE_LINK) {
+		    if (TclOSlstat(nativeEntry, &buf) == 0) {
+			if (S_ISLNK(buf.st_mode)) {
+			    return 1;
 			}
 		    }
-		    return 0;
 		}
+		return 0;
 	    }
+	}
 
-	    /*
-	     * In order bcdpfls as in 'find -t'
-	     */
+	/*
+	 * In order bcdpsfl as in 'find -t'
+	 */
 
-	    if (((types->type & TCL_GLOB_TYPE_BLOCK)&& S_ISBLK(buf.st_mode)) ||
+	if (    ((types->type & TCL_GLOB_TYPE_BLOCK)&& S_ISBLK(buf.st_mode)) ||
 		((types->type & TCL_GLOB_TYPE_CHAR) && S_ISCHR(buf.st_mode)) ||
 		((types->type & TCL_GLOB_TYPE_DIR)  && S_ISDIR(buf.st_mode)) ||
 		((types->type & TCL_GLOB_TYPE_PIPE) && S_ISFIFO(buf.st_mode))||
-		((types->type & TCL_GLOB_TYPE_FILE) && S_ISREG(buf.st_mode))
 #ifdef S_ISSOCK
-		||((types->type & TCL_GLOB_TYPE_SOCK) && S_ISSOCK(buf.st_mode))
+		((types->type & TCL_GLOB_TYPE_SOCK) && S_ISSOCK(buf.st_mode))||
 #endif /* S_ISSOCK */
-		) {
-		/*
-		 * Do nothing - this file is ok.
-		 */
-	    } else {
+		((types->type & TCL_GLOB_TYPE_FILE) && S_ISREG(buf.st_mode))) {
+	    /*
+	     * Do nothing - this file is ok.
+	     */
+	} else {
 #ifdef S_ISLNK
-		if (types->type & TCL_GLOB_TYPE_LINK) {
-		    if (TclOSlstat(nativeEntry, &buf) == 0) {
-			if (S_ISLNK(buf.st_mode)) {
-			    goto filetypeOK;
-			}
+	    if (types->type & TCL_GLOB_TYPE_LINK) {
+		if (TclOSlstat(nativeEntry, &buf) == 0) {
+		    if (S_ISLNK(buf.st_mode)) {
+			goto filetypeOK;
 		    }
 		}
-#endif /* S_ISLNK */
-		return 0;
 	    }
+#endif /* S_ISLNK */
+	    return 0;
 	}
-    filetypeOK: ;
+    }
+  filetypeOK:
+
+    /*
+     * If we're on OSX, we also have to worry about matching the file creator
+     * code (if specified). Do that now.
+     */
+
 #ifdef MAC_OSX_TCL
-	if (types->macType != NULL || types->macCreator != NULL ||
-		(types->perm & TCL_GLOB_PERM_HIDDEN)) {
-	    int matchResult;
+    if (types->macType != NULL || types->macCreator != NULL ||
+	    (types->perm & TCL_GLOB_PERM_HIDDEN)) {
+	int matchResult;
 
-	    if (types->perm == 0 && types->type == 0) {
-		/*
-		 * We haven't yet done a stat on the file.
-		 */
+	if (types->perm == 0 && types->type == 0) {
+	    /*
+	     * We haven't yet done a stat on the file.
+	     */
 
-		if (TclOSstat(nativeEntry, &buf) != 0) {
-		    return 0;
-		}
+	    if (TclOSstat(nativeEntry, &buf) != 0) {
+		return 0;
 	    }
+	}
 
-	    matchResult = TclMacOSXMatchType(interp, nativeEntry, nativeName,
-		    &buf, types);
-	    if (matchResult != 1) {
-		return matchResult;
-	    }
+	matchResult = TclMacOSXMatchType(interp, nativeEntry, nativeName,
+		&buf, types);
+	if (matchResult != 1) {
+	    return matchResult;
 	}
-#endif
     }
+#endif /* MAC_OSX_TCL */
+
     return 1;
 }
 
@@ -558,15 +570,14 @@ NativeMatchType(
 
 char *
 TclpGetUserHome(
-    CONST char *name,		/* User name for desired home directory. */
+    const char *name,		/* User name for desired home directory. */
     Tcl_DString *bufferPtr)	/* Uninitialized or free DString filled with
 				 * name of user's home directory. */
 {
     struct passwd *pwPtr;
     Tcl_DString ds;
-    CONST char *native;
+    const char *native = Tcl_UtfToExternalDString(NULL, name, -1, &ds);
 
-    native = Tcl_UtfToExternalDString(NULL, name, -1, &ds);
     pwPtr = getpwnam(native);				/* INTL: Native. */
     Tcl_DStringFree(&ds);
 
@@ -600,12 +611,12 @@ TclpObjAccess(
     Tcl_Obj *pathPtr,		/* Path of file to access */
     int mode)			/* Permission setting. */
 {
-    CONST char *path = Tcl_FSGetNativePath(pathPtr);
+    const char *path = Tcl_FSGetNativePath(pathPtr);
+
     if (path == NULL) {
 	return -1;
-    } else {
-	return access(path, mode);
     }
+    return access(path, mode);
 }
 
 /*
@@ -628,12 +639,12 @@ int
 TclpObjChdir(
     Tcl_Obj *pathPtr)		/* Path to new working directory */
 {
-    CONST char *path = Tcl_FSGetNativePath(pathPtr);
+    const char *path = Tcl_FSGetNativePath(pathPtr);
+
     if (path == NULL) {
 	return -1;
-    } else {
-	return chdir(path);
     }
+    return chdir(path);
 }
 
 /*
@@ -688,24 +699,27 @@ TclpGetNativeCwd(
     char buffer[MAXPATHLEN+1];
 
 #ifdef USEGETWD
-    if (getwd(buffer) == NULL)				/* INTL: Native. */
+    if (getwd(buffer) == NULL) {			/* INTL: Native. */
+	return NULL;
+    }
 #else
-    if (getcwd(buffer, MAXPATHLEN+1) == NULL)		/* INTL: Native. */
-#endif
-    {
+    if (getcwd(buffer, MAXPATHLEN+1) == NULL) {		/* INTL: Native. */
 	return NULL;
     }
-    if ((clientData != NULL) && strcmp(buffer, (CONST char*)clientData) == 0) {
-	/*
-	 * No change to pwd.
-	 */
+#endif
+
+    if ((clientData == NULL) || strcmp(buffer, (const char*)clientData)) {
+	char *newCd = ckalloc((unsigned) strlen(buffer) + 1);
 
-	return clientData;
-    } else {
-	char *newCd = (char *) ckalloc((unsigned) (strlen(buffer) + 1));
 	strcpy(newCd, buffer);
 	return (ClientData) newCd;
     }
+
+    /*
+     * No change to pwd.
+     */
+
+    return clientData;
 }
 
 /*
@@ -730,7 +744,7 @@ TclpGetNativeCwd(
  *----------------------------------------------------------------------
  */
 
-CONST char *
+const char *
 TclpGetCwd(
     Tcl_Interp *interp,		/* If non-NULL, used for error reporting. */
     Tcl_DString *bufferPtr)	/* Uninitialized or free DString filled with
@@ -776,14 +790,14 @@ TclpGetCwd(
 
 char *
 TclpReadlink(
-    CONST char *path,		/* Path of file to readlink (UTF-8). */
+    const char *path,		/* Path of file to readlink (UTF-8). */
     Tcl_DString *linkPtr)	/* Uninitialized or free DString filled with
 				 * contents of link (UTF-8). */
 {
 #ifndef DJGPP
     char link[MAXPATHLEN];
     int length;
-    CONST char *native;
+    const char *native;
     Tcl_DString ds;
 
     native = Tcl_UtfToExternalDString(NULL, path, -1, &ds);
@@ -822,12 +836,12 @@ TclpObjStat(
     Tcl_Obj *pathPtr,		/* Path of file to stat */
     Tcl_StatBuf *bufPtr)	/* Filled with results of stat call. */
 {
-    CONST char *path = Tcl_FSGetNativePath(pathPtr);
+    const char *path = Tcl_FSGetNativePath(pathPtr);
+
     if (path == NULL) {
 	return -1;
-    } else {
-	return TclOSstat(path, bufPtr);
     }
+    return TclOSstat(path, bufPtr);
 }
 
 #ifdef S_IFLNK
@@ -839,8 +853,8 @@ TclpObjLink(
     int linkAction)
 {
     if (toPtr != NULL) {
-	CONST char *src = Tcl_FSGetNativePath(pathPtr);
-	CONST char *target = NULL;
+	const char *src = Tcl_FSGetNativePath(pathPtr);
+	const char *target = NULL;
 
 	if (src == NULL) {
 	    return NULL;
@@ -1034,8 +1048,8 @@ TclpNativeToNormalized(
     Tcl_Obj *objPtr;
     int len;
 
-    CONST char *copy;
-    Tcl_ExternalToUtfDString(NULL, (CONST char*)clientData, -1, &ds);
+    const char *copy;
+    Tcl_ExternalToUtfDString(NULL, (const char*)clientData, -1, &ds);
 
     copy = Tcl_DStringValue(&ds);
     len = Tcl_DStringLength(&ds);
@@ -1066,11 +1080,10 @@ ClientData
 TclNativeCreateNativeRep(
     Tcl_Obj *pathPtr)
 {
-    char *nativePathPtr;
+    char *nativePathPtr, *str;
     Tcl_DString ds;
     Tcl_Obj *validPathPtr;
     int len;
-    char *str;
 
     if (TclFSCwdIsNative()) {
 	/*
@@ -1100,7 +1113,7 @@ TclNativeCreateNativeRep(
     len = Tcl_DStringLength(&ds) + sizeof(char);
     Tcl_DecrRefCount(validPathPtr);
     nativePathPtr = ckalloc((unsigned) len);
-    memcpy((void*)nativePathPtr, (void*)Tcl_DStringValue(&ds), (size_t) len);
+    memcpy(nativePathPtr, Tcl_DStringValue(&ds), (size_t) len);
 
     Tcl_DStringFree(&ds);
     return (ClientData)nativePathPtr;
@@ -1138,11 +1151,11 @@ TclNativeDupInternalRep(
      * ASCII representation when running on Unix.
      */
 
-    len = sizeof(char) + (strlen((CONST char*) clientData) * sizeof(char));
+    len = (strlen((const char*) clientData) + 1) * sizeof(char);
 
-    copy = (char *) ckalloc(len);
-    memcpy((void *) copy, (void *) clientData, len);
-    return (ClientData)copy;
+    copy = ckalloc(len);
+    memcpy(copy, clientData, len);
+    return (ClientData) copy;
 }
 
 /*
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index a9309c3..4c8427d 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -7,7 +7,7 @@
  * Copyright (c) 1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tclUnixInit.c,v 1.82 2007/12/13 15:28:42 dgp Exp $
+ * RCS: @(#) $Id: tclUnixInit.c,v 1.83 2008/04/27 22:21:35 dkf Exp $
  */
 
 #include "tclInt.h"
@@ -128,8 +128,8 @@ static char pkgPath[sizeof(TCL_PACKAGE_PATH)+200] = TCL_PACKAGE_PATH;
  */
 
 typedef struct LocaleTable {
-    CONST char *lang;
-    CONST char *encoding;
+    const char *lang;
+    const char *encoding;
 } LocaleTable;
 
 /*
@@ -142,7 +142,7 @@ typedef struct LocaleTable {
  * among existing platforms.
  */
 
-static CONST LocaleTable localeTable[] = {
+static const LocaleTable localeTable[] = {
 	    {"",		"iso8859-1"},
 		    {"ansi-1251",	"cp1251"},
 	    {"ansi_x3.4-1968",	"iso8859-1"},
@@ -480,7 +480,7 @@ TclpInitLibraryPath(
 {
 #define LIBRARY_SIZE	    32
     Tcl_Obj *pathPtr, *objPtr;
-    CONST char *str;
+    const char *str;
     Tcl_DString buffer;
 
     pathPtr = Tcl_NewObj();
@@ -499,7 +499,7 @@ TclpInitLibraryPath(
     if ((str != NULL) && (str[0] != '\0')) {
 	Tcl_DString ds;
 	int pathc;
-	CONST char **pathv;
+	const char **pathv;
 	char installLib[LIBRARY_SIZE];
 
 	Tcl_DStringInit(&ds);
@@ -612,9 +612,9 @@ TclpSetInterfaces(void)
     /* do nothing */
 }
 
-static CONST char *
+static const char *
 SearchKnownEncodings(
-    CONST char *encoding)
+    const char *encoding)
 {
     int left = 0;
     int right = sizeof(localeTable)/sizeof(LocaleTable);
@@ -635,12 +635,12 @@ SearchKnownEncodings(
     return NULL;
 }
 
-CONST char *
+const char *
 Tcl_GetEncodingNameFromEnvironment(
     Tcl_DString *bufPtr)
 {
-    CONST char *encoding;
-    CONST char *knownEncoding;
+    const char *encoding;
+    const char *knownEncoding;
 
     Tcl_DStringInit(bufPtr);
 
@@ -696,7 +696,7 @@ Tcl_GetEncodingNameFromEnvironment(
     }
 
     if (encoding != NULL) {
-	CONST char *p;
+	const char *p;
 	Tcl_DString ds;
 
 	Tcl_DStringInit(&ds);
@@ -800,7 +800,7 @@ TclpSetVariables(
 #endif /* MAC_OS_X_VERSION_MAX_ALLOWED > 1020 */
 
     if (MacOSXGetLibraryPath(interp, MAXPATHLEN, tclLibPath) == TCL_OK) {
-	CONST char *str;
+	const char *str;
 	CFBundleRef bundleRef;
 
 	Tcl_SetVar(interp, "tclDefaultLibrary", tclLibPath, TCL_GLOBAL_ONLY);
@@ -876,7 +876,7 @@ TclpSetVariables(
     unameOK = 0;
 #ifndef NO_UNAME
     if (uname(&name) >= 0) {
-	CONST char *native;
+	const char *native;
 
 	unameOK = 1;
 
@@ -973,7 +973,7 @@ TclpSetVariables(
 
 int
 TclpFindVariable(
-    CONST char *name,		/* Name of desired environment variable
+    const char *name,		/* Name of desired environment variable
 				 * (native). */
     int *lengthPtr)		/* Used to return length of name (for
 				 * successful searches) or number of non-NULL
@@ -981,7 +981,7 @@ TclpFindVariable(
 				 * searches). */
 {
     int i, result = -1;
-    register CONST char *env, *p1, *p2;
+    register const char *env, *p1, *p2;
     Tcl_DString envString;
 
     Tcl_DStringInit(&envString);
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 973fd18..cbfe546 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.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: tclUnixSock.c,v 1.20 2007/12/13 15:28:42 dgp Exp $
+ * RCS: @(#) $Id: tclUnixSock.c,v 1.21 2008/04/27 22:21:35 dkf Exp $
  */
 
 #include "tclInt.h"
@@ -42,7 +42,7 @@ InitializeHostName(
     int *lengthPtr,
     Tcl_Encoding *encodingPtr)
 {
-    CONST char *native = NULL;
+    const char *native = NULL;
 
 #ifndef NO_UNAME
     struct utsname u;
@@ -94,7 +94,7 @@ InitializeHostName(
      * Fix suggested by Viktor Dukhovni (viktor@esm.com)
      */
 
-#    if defined(SYS_NMLN) && SYS_NMLEN >= 256
+#    if defined(SYS_NMLN) && (SYS_NMLEN >= 256)
     char buffer[SYS_NMLEN];
 #    else
     char buffer[256];
@@ -107,8 +107,8 @@ InitializeHostName(
 
     *encodingPtr = Tcl_GetEncoding(NULL, NULL);
     *lengthPtr = strlen(native);
-    *valuePtr = ckalloc((unsigned int) (*lengthPtr)+1);
-    memcpy(*valuePtr, (void *) native, (size_t)(*lengthPtr)+1);
+    *valuePtr = ckalloc((unsigned) (*lengthPtr) + 1);
+    memcpy(*valuePtr, native, (size_t)(*lengthPtr)+1);
 }
 
 /*
@@ -129,7 +129,7 @@ InitializeHostName(
  *----------------------------------------------------------------------
  */
 
-CONST char *
+const char *
 Tcl_GetHostName(void)
 {
     return Tcl_GetString(TclGetProcessGlobalValue(&hostName));
diff --git a/unix/tclUnixTest.c b/unix/tclUnixTest.c
index a894d4d..b3bf457 100644
--- a/unix/tclUnixTest.c
+++ b/unix/tclUnixTest.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: tclUnixTest.c,v 1.26 2007/04/20 06:11:00 kennykb Exp $
+ * RCS: @(#) $Id: tclUnixTest.c,v 1.27 2008/04/27 22:21:35 dkf Exp $
  */
 
 #include "tclInt.h"
@@ -63,25 +63,25 @@ static char *gotsig = "0";
 
 static void		TestFileHandlerProc(ClientData clientData, int mask);
 static int		TestfilehandlerCmd(ClientData dummy,
-			    Tcl_Interp *interp, int argc, CONST char **argv);
+			    Tcl_Interp *interp, int argc, const char **argv);
 static int		TestfilewaitCmd(ClientData dummy,
-			    Tcl_Interp *interp, int argc, CONST char **argv);
+			    Tcl_Interp *interp, int argc, const char **argv);
 static int		TestfindexecutableCmd(ClientData dummy,
-			    Tcl_Interp *interp, int argc, CONST char **argv);
+			    Tcl_Interp *interp, int argc, const char **argv);
 static int		TestgetopenfileCmd(ClientData dummy,
-			    Tcl_Interp *interp, int argc, CONST char **argv);
+			    Tcl_Interp *interp, int argc, const char **argv);
 static int		TestgetdefencdirCmd(ClientData dummy,
-			    Tcl_Interp *interp, int argc, CONST char **argv);
+			    Tcl_Interp *interp, int argc, const char **argv);
 static int		TestsetdefencdirCmd(ClientData dummy,
-			    Tcl_Interp *interp, int argc, CONST char **argv);
+			    Tcl_Interp *interp, int argc, const char **argv);
 int			TclplatformtestInit(Tcl_Interp *interp);
 static int		TestalarmCmd(ClientData dummy,
-			    Tcl_Interp *interp, int argc, CONST char **argv);
+			    Tcl_Interp *interp, int argc, const char **argv);
 static int		TestgotsigCmd(ClientData dummy,
-			    Tcl_Interp *interp, int argc, CONST char **argv);
+			    Tcl_Interp *interp, int argc, const char **argv);
 static void		AlarmHandler(int signum);
 static int		TestchmodCmd(ClientData dummy,
-			    Tcl_Interp *interp, int argc, CONST char **argv);
+			    Tcl_Interp *interp, int argc, const char **argv);
 
 /*
  *----------------------------------------------------------------------
@@ -147,7 +147,7 @@ TestfilehandlerCmd(
     ClientData clientData,	/* Not used. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int argc,			/* Number of arguments. */
-    CONST char **argv)		/* Argument strings. */
+    const char **argv)		/* Argument strings. */
 {
     Pipe *pipePtr;
     int i, mask, timeout;
@@ -369,7 +369,7 @@ TestfilewaitCmd(
     ClientData clientData,	/* Not used. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int argc,			/* Number of arguments. */
-    CONST char **argv)		/* Argument strings. */
+    const char **argv)		/* Argument strings. */
 {
     int mask, result, timeout;
     Tcl_Channel channel;
@@ -438,7 +438,7 @@ TestfindexecutableCmd(
     ClientData clientData,	/* Not used. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int argc,			/* Number of arguments. */
-    CONST char **argv)		/* Argument strings. */
+    const char **argv)		/* Argument strings. */
 {
     Tcl_Obj *saveName;
 
@@ -481,7 +481,7 @@ TestgetopenfileCmd(
     ClientData clientData,	/* Not used. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int argc,			/* Number of arguments. */
-    CONST char **argv)		/* Argument strings. */
+    const char **argv)		/* Argument strings. */
 {
     ClientData filePtr;
 
@@ -524,7 +524,7 @@ TestsetdefencdirCmd(
     ClientData clientData,	/* Not used. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int argc,			/* Number of arguments. */
-    CONST char **argv)		/* Argument strings. */
+    const char **argv)		/* Argument strings. */
 {
     if (argc != 2) {
         Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
@@ -558,7 +558,7 @@ TestgetdefencdirCmd(
     ClientData clientData,	/* Not used. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int argc,			/* Number of arguments. */
-    CONST char **argv)		/* Argument strings. */
+    const char **argv)		/* Argument strings. */
 {
     if (argc != 1) {
         Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], NULL);
@@ -592,7 +592,7 @@ TestalarmCmd(
     ClientData clientData,	/* Not used. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int argc,			/* Number of arguments. */
-    CONST char **argv)		/* Argument strings. */
+    const char **argv)		/* Argument strings. */
 {
 #ifdef SA_RESTART
     unsigned int sec;
@@ -671,7 +671,7 @@ TestgotsigCmd(
     ClientData clientData,	/* Not used. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int argc,			/* Number of arguments. */
-    CONST char **argv)		/* Argument strings. */
+    const char **argv)		/* Argument strings. */
 {
     Tcl_AppendResult(interp, gotsig, NULL);
     gotsig = "0";
@@ -702,7 +702,7 @@ TestchmodCmd(
     ClientData dummy,			/* Not used. */
     Tcl_Interp *interp,			/* Current interpreter. */
     int argc,				/* Number of arguments. */
-    CONST char **argv)			/* Argument strings. */
+    const char **argv)			/* Argument strings. */
 {
     int i, mode;
     char *rest;
@@ -721,7 +721,7 @@ TestchmodCmd(
 
     for (i = 2; i < argc; i++) {
 	Tcl_DString buffer;
-	CONST char *translated;
+	const char *translated;
 
 	translated = Tcl_TranslateFileName(interp, argv[i], &buffer);
 	if (translated == NULL) {
diff --git a/unix/tclUnixTime.c b/unix/tclUnixTime.c
index 780098f..4f40980 100644
--- a/unix/tclUnixTime.c
+++ b/unix/tclUnixTime.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: tclUnixTime.c,v 1.34 2008/04/14 17:54:57 kennykb Exp $
+ * RCS: @(#) $Id: tclUnixTime.c,v 1.35 2008/04/27 22:21:35 dkf Exp $
  */
 
 #include "tclInt.h"
@@ -386,7 +386,7 @@ Tcl_GetTime(
 
 struct tm *
 TclpGetDate(
-    CONST time_t *time,
+    const time_t *time,
     int useGMT)
 {
     if (useGMT) {
@@ -414,7 +414,7 @@ TclpGetDate(
 
 struct tm *
 TclpGmtime(
-    CONST time_t *timePtr)	/* Pointer to the number of seconds since the
+    const time_t *timePtr)	/* Pointer to the number of seconds since the
 				 * local system's epoch */
 {
     /*
@@ -440,7 +440,7 @@ TclpGmtime(
 
 struct tm *
 TclpGmtime_unix(
-    CONST time_t *timePtr)
+    const time_t *timePtr)
 {
     return TclpGmtime(timePtr);
 }
@@ -464,7 +464,7 @@ TclpGmtime_unix(
 
 struct tm *
 TclpLocaltime(
-    CONST time_t *timePtr)	/* Pointer to the number of seconds since the
+    const time_t *timePtr)	/* Pointer to the number of seconds since the
 				 * local system's epoch */
 {
     /*
@@ -489,7 +489,7 @@ TclpLocaltime(
  */
 struct tm*
 TclpLocaltime_unix(
-    CONST time_t *timePtr)
+    const time_t *timePtr)
 {
     return TclpLocaltime(timePtr);
 }
@@ -630,7 +630,7 @@ NativeGetTime(
 static void
 SetTZIfNecessary(void)
 {
-    CONST char *newTZ = getenv("TZ");
+    const char *newTZ = getenv("TZ");
 
     Tcl_MutexLock(&tmMutex);
     if (newTZ == NULL) {
diff --git a/unix/tclXtTest.c b/unix/tclXtTest.c
index 425726d..1150fee 100644
--- a/unix/tclXtTest.c
+++ b/unix/tclXtTest.c
@@ -8,14 +8,14 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclXtTest.c,v 1.6 2005/11/02 23:26:50 dkf Exp $
+ * RCS: @(#) $Id: tclXtTest.c,v 1.7 2008/04/27 22:21:35 dkf Exp $
  */
 
 #include <X11/Intrinsic.h>
 #include "tcl.h"
 
 static int	TesteventloopCmd(ClientData clientData,
-		    Tcl_Interp *interp, int argc, CONST char **argv);
+		    Tcl_Interp *interp, int argc, const char **argv);
 extern void	InitNotifier(void);
 
 /*
@@ -74,7 +74,7 @@ TesteventloopCmd(
     ClientData clientData,	/* Not used. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int argc,			/* Number of arguments. */
-    CONST char **argv)		/* Argument strings. */
+    const char **argv)		/* Argument strings. */
 {
     static int *framePtr = NULL;/* Pointer to integer on stack frame of
 				 * innermost invocation of the "wait"