diff options
author | nijtmans <nijtmans@noemail.net> | 2007-02-20 23:24:01 (GMT) |
---|---|---|
committer | nijtmans <nijtmans@noemail.net> | 2007-02-20 23:24:01 (GMT) |
commit | 8304773d8b2ee19516ec98b7f43772b3e3cafd0b (patch) | |
tree | 2fc3ee74f9099dbc66a0d0d154665561411fd654 /generic/tclPathObj.c | |
parent | 3b0c004d36f5baf787ca1438ae23df0dc34cafc2 (diff) | |
download | tcl-8304773d8b2ee19516ec98b7f43772b3e3cafd0b.zip tcl-8304773d8b2ee19516ec98b7f43772b3e3cafd0b.tar.gz tcl-8304773d8b2ee19516ec98b7f43772b3e3cafd0b.tar.bz2 |
various "const" additions, in line with TIP #27
FossilOrigin-Name: 81ea4e1335f3c78465e90ec021758c096ba9b544
Diffstat (limited to 'generic/tclPathObj.c')
-rw-r--r-- | generic/tclPathObj.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c index 1aa5cb2..a3dce53 100644 --- a/generic/tclPathObj.c +++ b/generic/tclPathObj.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: tclPathObj.c,v 1.57 2007/02/20 15:36:46 patthoyts Exp $ + * RCS: @(#) $Id: tclPathObj.c,v 1.58 2007/02/20 23:24:02 nijtmans Exp $ */ #include "tclInt.h" @@ -24,7 +24,7 @@ static void DupFsPathInternalRep(Tcl_Obj *srcPtr, Tcl_Obj *copyPtr); static void FreeFsPathInternalRep(Tcl_Obj *pathPtr); static void UpdateStringOfFsPath(Tcl_Obj *pathPtr); static int SetFsPathFromAny(Tcl_Interp *interp, Tcl_Obj *pathPtr); -static int FindSplitPos(CONST char *path, int separator); +static int FindSplitPos(const char *path, int separator); static int IsSeparatorOrNull(int ch); static Tcl_Obj* GetExtension(Tcl_Obj *pathPtr); @@ -158,7 +158,7 @@ TclFSNormalizeAbsolutePath( * of normalization. */ { ClientData clientData = NULL; - CONST char *dirSep, *oldDirSep; + const char *dirSep, *oldDirSep; int first = 1; /* Set to zero once we've passed the first * directory separator - we can't use '..' to * remove the volume in a path. */ @@ -231,7 +231,7 @@ TclFSNormalizeAbsolutePath( int curLen; if (retVal == NULL) { - CONST char *path = TclGetString(pathPtr); + const char *path = TclGetString(pathPtr); retVal = Tcl_NewStringObj(path, dirSep - path); Tcl_IncrRefCount(retVal); } @@ -256,7 +256,7 @@ TclFSNormalizeAbsolutePath( */ if (retVal == NULL) { - CONST char *path = TclGetString(pathPtr); + const char *path = TclGetString(pathPtr); retVal = Tcl_NewStringObj(path, dirSep - path); Tcl_IncrRefCount(retVal); } @@ -281,7 +281,7 @@ TclFSNormalizeAbsolutePath( * the link onto the directory of the path so far. */ - CONST char *path = + const char *path = Tcl_GetStringFromObj(retVal, &curLen); while (--curLen >= 0) { @@ -397,7 +397,7 @@ TclFSNormalizeAbsolutePath( if (tclPlatform == TCL_PLATFORM_WINDOWS) { int len; - CONST char *path = Tcl_GetStringFromObj(retVal, &len); + const char *path = Tcl_GetStringFromObj(retVal, &len); if (len == 2 && path[0] != 0 && path[1] == ':') { if (Tcl_IsShared(retVal)) { @@ -563,7 +563,7 @@ TclPathPart( * the standardPath code. */ - CONST char *rest = TclGetString(fsPathPtr->normPathPtr); + const char *rest = TclGetString(fsPathPtr->normPathPtr); if (strchr(rest, '/') != NULL) { goto standardPath; @@ -588,7 +588,7 @@ TclPathPart( * we don't, and instead just use the standardPath code. */ - CONST char *rest = TclGetString(fsPathPtr->normPathPtr); + const char *rest = TclGetString(fsPathPtr->normPathPtr); if (strchr(rest, '/') != NULL) { goto standardPath; @@ -603,7 +603,7 @@ TclPathPart( case TCL_PATH_EXTENSION: return GetExtension(fsPathPtr->normPathPtr); case TCL_PATH_ROOT: { - CONST char *fileName, *extension; + const char *fileName, *extension; int length; fileName = Tcl_GetStringFromObj(fsPathPtr->normPathPtr, @@ -673,7 +673,7 @@ TclPathPart( return GetExtension(pathPtr); } else if (portion == TCL_PATH_ROOT) { int length; - CONST char *fileName, *extension; + const char *fileName, *extension; fileName = Tcl_GetStringFromObj(pathPtr, &length); extension = TclGetExtension(fileName); @@ -750,7 +750,7 @@ static Tcl_Obj * GetExtension( Tcl_Obj *pathPtr) { - CONST char *tail, *extension; + const char *tail, *extension; Tcl_Obj *ret; tail = TclGetString(pathPtr); @@ -864,7 +864,7 @@ Tcl_FSJoinPath( Tcl_ListObjIndex(NULL, listObj, i+1, &tail); type = TclGetPathType(tail, NULL, NULL, NULL); if (type == TCL_PATH_RELATIVE) { - CONST char *str; + const char *str; int len; str = Tcl_GetStringFromObj(tail, &len); @@ -917,7 +917,7 @@ Tcl_FSJoinPath( } return tail; } else { - CONST char *str; + const char *str; int len; str = Tcl_GetStringFromObj(tail, &len); @@ -1190,7 +1190,7 @@ IsSeparatorOrNull( static int FindSplitPos( - CONST char *path, + const char *path, int separator) { int count = 0; @@ -1241,7 +1241,7 @@ FindSplitPos( Tcl_Obj * TclNewFSPathObj( Tcl_Obj *dirPtr, - CONST char *addStrRep, + const char *addStrRep, int len) { FsPath *fsPathPtr; @@ -1309,7 +1309,7 @@ TclFSMakePathRelative( Tcl_Obj *cwdPtr) /* Make it relative to this. */ { int cwdLen, len; - CONST char *tempStr; + const char *tempStr; ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&tclFsDataKey); if (pathPtr->typePtr == &tclFsPathType) { @@ -1639,7 +1639,7 @@ Tcl_FSGetTranslatedPath( *--------------------------------------------------------------------------- */ -CONST char * +const char * Tcl_FSGetTranslatedStringPath( Tcl_Interp *interp, Tcl_Obj *pathPtr) @@ -1648,7 +1648,7 @@ Tcl_FSGetTranslatedStringPath( if (transPtr != NULL) { int len; - CONST char *result, *orig; + const char *result, *orig; orig = Tcl_GetStringFromObj(transPtr, &len); result = (char*) ckalloc((unsigned)(len+1)); @@ -1700,7 +1700,7 @@ Tcl_FSGetNormalizedPath( Tcl_Obj *dir, *copy; int cwdLen; int pathType; - CONST char *cwdStr; + const char *cwdStr; ClientData clientData = NULL; pathType = Tcl_FSGetPathType(fsPathPtr->cwdPtr); @@ -1811,7 +1811,7 @@ Tcl_FSGetNormalizedPath( } else if (fsPathPtr->normPathPtr == NULL) { int cwdLen; Tcl_Obj *copy; - CONST char *cwdStr; + const char *cwdStr; ClientData clientData = NULL; copy = Tcl_DuplicateObj(fsPathPtr->cwdPtr); @@ -1864,7 +1864,7 @@ Tcl_FSGetNormalizedPath( */ Tcl_Obj *absolutePath = fsPathPtr->translatedPathPtr; - CONST char *path = TclGetString(absolutePath); + const char *path = TclGetString(absolutePath); /* * We have to be a little bit careful here to avoid infinite loops @@ -2041,7 +2041,7 @@ Tcl_FSGetInternalRep( */ if (fsPtr != srcFsPathPtr->fsRecPtr->fsPtr) { - Tcl_Filesystem *actualFs = Tcl_FSGetFileSystemForPath(pathPtr); + const Tcl_Filesystem *actualFs = Tcl_FSGetFileSystemForPath(pathPtr); if (actualFs == fsPtr) { return Tcl_FSGetInternalRep(pathPtr, fsPtr); @@ -2306,7 +2306,7 @@ SetFsPathFromAny( * We have just '~' */ - CONST char *dir; + const char *dir; Tcl_DString dirString; if (split != len) { @@ -2401,7 +2401,7 @@ SetFsPathFromAny( #if defined(__CYGWIN__) && defined(__WIN32__) { - extern int cygwin_conv_to_win32_path(CONST char *, char *); + extern int cygwin_conv_to_win32_path(const char *, char *); char winbuf[MAX_PATH+1]; /* @@ -2570,7 +2570,7 @@ UpdateStringOfFsPath( register Tcl_Obj *pathPtr) /* path obj with string rep to update. */ { FsPath* fsPathPtr = (FsPath*) PATHOBJ(pathPtr); - CONST char *cwdStr; + const char *cwdStr; int cwdLen; Tcl_Obj *copy; |