diff options
| author | dgp@users.sourceforge.net <dgp> | 2012-06-20 20:13:34 (GMT) |
|---|---|---|
| committer | dgp@users.sourceforge.net <dgp> | 2012-06-20 20:13:34 (GMT) |
| commit | 09e77e33c6c2cebb17342fc5d00174140f631be2 (patch) | |
| tree | 411e52b57560b7aff4e96229eeb8e6b651f37772 /generic/tclIOUtil.c | |
| parent | 0a3664888bcb7277e40a4a11414257487b52ec7d (diff) | |
| parent | e6c2017199eba11d490e8abe05f1fd3ce4c7fb91 (diff) | |
| download | tcl-09e77e33c6c2cebb17342fc5d00174140f631be2.zip tcl-09e77e33c6c2cebb17342fc5d00174140f631be2.tar.gz tcl-09e77e33c6c2cebb17342fc5d00174140f631be2.tar.bz2 | |
merge 8.5
Diffstat (limited to 'generic/tclIOUtil.c')
| -rw-r--r-- | generic/tclIOUtil.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c index 80eccbf..0600a6c 100644 --- a/generic/tclIOUtil.c +++ b/generic/tclIOUtil.c @@ -1447,14 +1447,9 @@ int TclFSNormalizeToUniquePath( Tcl_Interp *interp, /* Used for error messages. */ Tcl_Obj *pathPtr, /* The path to normalize in place */ - int startAt, /* Start at this char-offset */ - ClientData *clientDataPtr) /* If we generated a complete normalized path - * for a given filesystem, we can optionally - * return an fs-specific clientdata here. */ + int startAt) /* Start at this char-offset */ { FilesystemRecord *fsRecPtr, *firstFsRecPtr; - /* Ignore this variable */ - (void) clientDataPtr; /* * Call each of the "normalise path" functions in succession. This is a @@ -2708,7 +2703,7 @@ Tcl_FSGetCwd( retVal = (*fsRecPtr->fsPtr->internalToNormalizedProc)( retCd); Tcl_IncrRefCount(retVal); - norm = TclFSNormalizeAbsolutePath(interp,retVal,NULL); + norm = TclFSNormalizeAbsolutePath(interp,retVal); if (norm != NULL) { /* * We found a cwd, which is now in our global @@ -2756,7 +2751,7 @@ Tcl_FSGetCwd( */ if (retVal != NULL) { - Tcl_Obj *norm = TclFSNormalizeAbsolutePath(interp, retVal, NULL); + Tcl_Obj *norm = TclFSNormalizeAbsolutePath(interp, retVal); if (norm != NULL) { /* * We found a cwd, which is now in our global storage. We must @@ -2824,8 +2819,7 @@ Tcl_FSGetCwd( retVal = (*proc)(interp); } if (retVal != NULL) { - Tcl_Obj *norm = TclFSNormalizeAbsolutePath(interp, - retVal, NULL); + Tcl_Obj *norm = TclFSNormalizeAbsolutePath(interp, retVal); /* * Check whether cwd has changed from the value previously |