summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--generic/tclFileSystem.h2
-rw-r--r--generic/tclIOUtil.c7
-rw-r--r--generic/tclPathObj.c20
3 files changed, 7 insertions, 22 deletions
diff --git a/generic/tclFileSystem.h b/generic/tclFileSystem.h
index d09d240..d6e1546 100644
--- a/generic/tclFileSystem.h
+++ b/generic/tclFileSystem.h
@@ -78,7 +78,7 @@ MODULE_SCOPE void TclFSSetPathDetails(Tcl_Obj *pathPtr,
FilesystemRecord *fsRecPtr,
ClientData clientData);
MODULE_SCOPE Tcl_Obj * TclFSNormalizeAbsolutePath(Tcl_Interp *interp,
- Tcl_Obj *pathPtr, ClientData *clientDataPtr);
+ Tcl_Obj *pathPtr);
/*
* Private shared variables for use by tclIOUtil.c and tclPathObj.c
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index e4b4ad6..e3c5816 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -2662,7 +2662,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
@@ -2708,7 +2708,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
@@ -2776,8 +2776,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
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index 8e45ef1..147c619 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -152,12 +152,7 @@ typedef struct FsPath {
Tcl_Obj *
TclFSNormalizeAbsolutePath(
Tcl_Interp *interp, /* Interpreter to use */
- Tcl_Obj *pathPtr, /* Absolute path to normalize */
- ClientData *clientDataPtr) /* If non-NULL, then may be set to the
- * fs-specific clientData for this path. This
- * will happen when that extra information can
- * be calculated efficiently as a side-effect
- * of normalization. */
+ Tcl_Obj *pathPtr) /* Absolute path to normalize */
{
const char *dirSep, *oldDirSep;
int first = 1; /* Set to zero once we've passed the first
@@ -439,9 +434,6 @@ TclFSNormalizeAbsolutePath(
*/
TclFSMakePathFromNormalized(interp, retVal);
- if (clientDataPtr != NULL) {
- *clientDataPtr = NULL;
- }
/*
* This has a refCount of 1 for the caller, unlike many Tcl_Obj APIs.
@@ -1873,7 +1865,7 @@ Tcl_FSGetNormalizedPath(
* we avoid [Bug 2385549] ...
*/
- Tcl_Obj *newCopy = TclFSNormalizeAbsolutePath(interp, copy, NULL);
+ Tcl_Obj *newCopy = TclFSNormalizeAbsolutePath(interp, copy);
Tcl_DecrRefCount(copy);
copy = newCopy;
} else {
@@ -1968,7 +1960,6 @@ Tcl_FSGetNormalizedPath(
}
}
if (fsPathPtr->normPathPtr == NULL) {
- ClientData clientData = NULL;
Tcl_Obj *useThisCwd = NULL;
int pureNormalized = 1;
@@ -2050,12 +2041,7 @@ Tcl_FSGetNormalizedPath(
*/
fsPathPtr->normPathPtr = TclFSNormalizeAbsolutePath(interp,
- absolutePath,
- (fsPathPtr->nativePathPtr == NULL ? &clientData : NULL));
- if (0 && (clientData != NULL)) {
- fsPathPtr->nativePathPtr =
- (*fsPathPtr->fsRecPtr->fsPtr->dupInternalRepProc)(clientData);
- }
+ absolutePath);
/*
* Check if path is pure normalized (this can only be the case if it