merge 8.5

1 files changed, 1 insertions, 28 deletions

diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index 96f1b30..117fab3 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -3861,33 +3861,6 @@ Tcl_FSSplitPath(
     return result;
 }
 
-/* Simple helper function */
-Tcl_Obj *
-TclFSInternalToNormalized(
-    Tcl_Filesystem *fromFilesystem,
-    ClientData clientData,
-    FilesystemRecord **fsRecPtrPtr)
-{
-    FilesystemRecord *fsRecPtr = FsGetFirstFilesystem();
-
-    Claim();
-    while (fsRecPtr != NULL) {
-	if (fsRecPtr->fsPtr == fromFilesystem) {
-	    *fsRecPtrPtr = fsRecPtr;
-	    break;
-	}
-	fsRecPtr = fsRecPtr->nextPtr;
-    }
-    Disclaim();
-
-    if ((fsRecPtr != NULL)
-	    && (fromFilesystem->internalToNormalizedProc != NULL)) {
-	return (*fromFilesystem->internalToNormalizedProc)(clientData);
-    } else {
-	return NULL;
-    }
-}
-
 /*
  *----------------------------------------------------------------------
  *
@@ -4488,7 +4461,7 @@ Tcl_FSGetFileSystemForPath(
 		 * above call to the pathInFilesystemProc.
 		 */
 
-		TclFSSetPathDetails(pathPtr, fsRecPtr, clientData);
+		TclFSSetPathDetails(pathPtr, fsRecPtr->fsPtr, clientData);
 		retVal = fsRecPtr->fsPtr;
 	    }
 	}