From 95f8b149514039db25023ac2a1692205deb4314b Mon Sep 17 00:00:00 2001 From: dgp Date: Tue, 17 Oct 2006 04:36:43 +0000 Subject: * generic/tclIOUtil.c: Cleaned up some code flagged by a * generic/tclInt.h: `make checkexports` test. * win/tclWin32Dll.c: * win/tclWinFile.c: --- ChangeLog | 7 +++++++ generic/tclIOUtil.c | 23 +++++++++++------------ generic/tclInt.h | 3 ++- win/tclWin32Dll.c | 8 ++++---- win/tclWinFile.c | 4 +--- 5 files changed, 25 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b4ae9a..dbb6349 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-10-17 Don Porter + + * generic/tclIOUtil.c: Cleaned up some code flagged by a + * generic/tclInt.h: `make checkexports` test. + * win/tclWin32Dll.c: + * win/tclWinFile.c: + 2006-10-16 Daniel Steffen *** 8.4.14 TAGGED FOR RELEASE *** diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c index 7ee2583..61cd561 100644 --- a/generic/tclIOUtil.c +++ b/generic/tclIOUtil.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: tclIOUtil.c,v 1.77.2.31 2006/08/30 17:48:48 hobbs Exp $ + * RCS: @(#) $Id: tclIOUtil.c,v 1.77.2.32 2006/10/17 04:36:44 dgp Exp $ */ #include "tclInt.h" @@ -86,13 +86,13 @@ extern int theFilesystemEpoch; /* * Private functions for use in this file */ -Tcl_PathType FSGetPathType _ANSI_ARGS_((Tcl_Obj *pathObjPtr, +static Tcl_PathType FSGetPathType _ANSI_ARGS_((Tcl_Obj *pathObjPtr, Tcl_Filesystem **filesystemPtrPtr, int *driveNameLengthPtr)); -Tcl_PathType GetPathType _ANSI_ARGS_((Tcl_Obj *pathObjPtr, +static Tcl_PathType GetPathType _ANSI_ARGS_((Tcl_Obj *pathObjPtr, Tcl_Filesystem **filesystemPtrPtr, int *driveNameLengthPtr, Tcl_Obj **driveNameRef)); -Tcl_FSPathInFilesystemProc NativePathInFilesystem; +static Tcl_FSPathInFilesystemProc NativePathInFilesystem; static Tcl_Obj* TclFSNormalizeAbsolutePath _ANSI_ARGS_((Tcl_Interp* interp, Tcl_Obj *pathPtr, ClientData *clientDataPtr)); @@ -373,7 +373,6 @@ TCL_DECLARE_MUTEX(obsoleteFsHookMutex) */ static Tcl_FSFilesystemSeparatorProc NativeFilesystemSeparator; static Tcl_FSFreeInternalRepProc NativeFreeInternalRep; -Tcl_FSDupInternalRepProc NativeDupInternalRep; static Tcl_FSCreateInternalRepProc NativeCreateNativeRep; static Tcl_FSFileAttrStringsProc NativeFileAttrStrings; static Tcl_FSFileAttrsGetProc NativeFileAttrsGet; @@ -420,7 +419,7 @@ Tcl_Filesystem tclNativeFilesystem = { sizeof(Tcl_Filesystem), TCL_FILESYSTEM_VERSION_1, &NativePathInFilesystem, - &NativeDupInternalRep, + &TclNativeDupInternalRep, &NativeFreeInternalRep, &TclpNativeToNormalized, &NativeCreateNativeRep, @@ -2966,7 +2965,7 @@ Tcl_FSLoadFile(interp, pathPtr, sym1, sym2, proc1Ptr, proc2Ptr, } else { /* We need the native rep */ tvdlPtr->divertedFileNativeRep = - NativeDupInternalRep(Tcl_FSGetInternalRep(copyToPtr, + TclNativeDupInternalRep(Tcl_FSGetInternalRep(copyToPtr, copyFsPtr)); /* * We don't need or want references to the copied @@ -3437,7 +3436,7 @@ TclFSInternalToNormalized(fromFilesystem, clientData, fsRecPtrPtr) *---------------------------------------------------------------------- */ -Tcl_PathType +static Tcl_PathType GetPathType(pathObjPtr, filesystemPtrPtr, driveNameLengthPtr, driveNameRef) Tcl_Obj *pathObjPtr; Tcl_Filesystem **filesystemPtrPtr; @@ -4097,7 +4096,7 @@ TclpNativeToNormalized(clientData) /* *--------------------------------------------------------------------------- * - * NativeDupInternalRep -- + * TclNativeDupInternalRep -- * * Duplicate the native representation. * @@ -4111,7 +4110,7 @@ TclpNativeToNormalized(clientData) *--------------------------------------------------------------------------- */ ClientData -NativeDupInternalRep(clientData) +TclNativeDupInternalRep(clientData) ClientData clientData; { ClientData copy; @@ -4723,7 +4722,7 @@ Tcl_FSGetPathType(pathObjPtr) *---------------------------------------------------------------------- */ -Tcl_PathType +static Tcl_PathType FSGetPathType(pathObjPtr, filesystemPtrPtr, driveNameLengthPtr) Tcl_Obj *pathObjPtr; Tcl_Filesystem **filesystemPtrPtr; @@ -6419,7 +6418,7 @@ UpdateStringOfFsPath(objPtr) * *--------------------------------------------------------------------------- */ -int +static int NativePathInFilesystem(pathPtr, clientDataPtr) Tcl_Obj *pathPtr; ClientData *clientDataPtr; diff --git a/generic/tclInt.h b/generic/tclInt.h index b5328ac..27681f8 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -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: tclInt.h,v 1.118.2.24 2006/09/22 22:31:34 andreas_kupries Exp $ + * RCS: @(#) $Id: tclInt.h,v 1.118.2.25 2006/10/17 04:36:44 dgp Exp $ */ #ifndef _TCLINT @@ -1812,6 +1812,7 @@ EXTERN int TclpMatchInDirectory _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *resultPtr, Tcl_Obj *pathPtr, CONST char *pattern, Tcl_GlobTypeData *types)); EXTERN Tcl_Obj* TclpObjGetCwd _ANSI_ARGS_((Tcl_Interp *interp)); +EXTERN Tcl_FSDupInternalRepProc TclNativeDupInternalRep; EXTERN Tcl_Obj* TclpObjLink _ANSI_ARGS_((Tcl_Obj *pathPtr, Tcl_Obj *toPtr, int linkType)); EXTERN int TclpObjChdir _ANSI_ARGS_((Tcl_Obj *pathPtr)); diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c index c107396..32fca20 100644 --- a/win/tclWin32Dll.c +++ b/win/tclWin32Dll.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: tclWin32Dll.c,v 1.24.2.9 2006/03/10 10:35:24 vincentdarley Exp $ + * RCS: @(#) $Id: tclWin32Dll.c,v 1.24.2.10 2006/10/17 04:36:45 dgp Exp $ */ #include "tclWinInt.h" @@ -230,7 +230,7 @@ MountPointMap *driveLetterLookup = NULL; TCL_DECLARE_MUTEX(mountPointMap) /* We will need this below */ -extern Tcl_FSDupInternalRepProc NativeDupInternalRep; +extern Tcl_FSDupInternalRepProc TclNativeDupInternalRep; #ifdef __WIN32__ #ifndef STATIC_BUILD @@ -926,7 +926,7 @@ TclWinDriveLetterForVolMountPoint(CONST WCHAR *mountPoint) } if (!alreadyStored) { dlPtr2 = (MountPointMap*) ckalloc(sizeof(MountPointMap)); - dlPtr2->volumeName = NativeDupInternalRep(Target); + dlPtr2->volumeName = TclNativeDupInternalRep(Target); dlPtr2->driveLetter = 'A' + (drive[0] - L'A'); dlPtr2->nextPtr = driveLetterLookup; driveLetterLookup = dlPtr2; @@ -947,7 +947,7 @@ TclWinDriveLetterForVolMountPoint(CONST WCHAR *mountPoint) * up each time. */ dlPtr2 = (MountPointMap*) ckalloc(sizeof(MountPointMap)); - dlPtr2->volumeName = NativeDupInternalRep((ClientData)mountPoint); + dlPtr2->volumeName = TclNativeDupInternalRep((ClientData)mountPoint); dlPtr2->driveLetter = -1; dlPtr2->nextPtr = driveLetterLookup; driveLetterLookup = dlPtr2; diff --git a/win/tclWinFile.c b/win/tclWinFile.c index f0e07f2..c87edc3 100644 --- a/win/tclWinFile.c +++ b/win/tclWinFile.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: tclWinFile.c,v 1.44.2.17 2006/10/01 21:51:34 patthoyts Exp $ + * RCS: @(#) $Id: tclWinFile.c,v 1.44.2.18 2006/10/17 04:36:45 dgp Exp $ */ //#define _WIN32_WINNT 0x0500 @@ -172,8 +172,6 @@ typedef NET_API_STATUS NET_API_FUNCTION NETAPIBUFFERFREEPROC typedef NET_API_STATUS NET_API_FUNCTION NETGETDCNAMEPROC (LPWSTR servername, LPWSTR domainname, LPBYTE *bufptr); -extern Tcl_FSDupInternalRepProc NativeDupInternalRep; - /* * Declarations for local procedures defined in this file: */ -- cgit v0.12