1 files changed, 20 insertions, 21 deletions

diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index 49d62dc..4e10087 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -36,7 +36,7 @@ static int		MakePathFromNormalized(Tcl_Interp *interp,
  * internally.
  */
 
-static const Tcl_ObjType tclFsPathType = {
+static const Tcl_ObjType fsPathType = {
     "path",				/* name */
     FreeFsPathInternalRep,		/* freeIntRepProc */
     DupFsPathInternalRep,		/* dupIntRepProc */
@@ -564,7 +564,7 @@ TclPathPart(
     Tcl_Obj *pathPtr,		/* Path to take dirname of */
     Tcl_PathPart portion)	/* Requested portion of name */
 {
-    if (pathPtr->typePtr == &tclFsPathType) {
+    if (pathPtr->typePtr == &fsPathType) {
 	FsPath *fsPathPtr = PATHOBJ(pathPtr);
 
 	if (PATHFLAGS(pathPtr) != 0) {
@@ -877,7 +877,7 @@ TclJoinPath(
 	 * to be an absolute path. Added a check for that elt is absolute.
 	 */
 
-	if ((elt->typePtr == &tclFsPathType)
+	if ((elt->typePtr == &fsPathType)
 		&& !((elt->bytes != NULL) && (elt->bytes[0] == '\0'))
                 && TclGetPathType(elt, NULL, NULL, NULL) == TCL_PATH_ABSOLUTE) {
             Tcl_Obj *tailObj = objv[1];
@@ -1164,7 +1164,7 @@ Tcl_FSConvertToPathType(
      * path.
      */
 
-    if (pathPtr->typePtr == &tclFsPathType) {
+    if (pathPtr->typePtr == &fsPathType) {
 	if (TclFSEpochOk(PATHOBJ(pathPtr)->filesystemEpoch)) {
 	    return TCL_OK;
 	}
@@ -1191,7 +1191,7 @@ Tcl_FSConvertToPathType(
      *             UpdateStringOfFsPath(pathPtr);
      *         }
      *         FreeFsPathInternalRep(pathPtr);
-     *         return Tcl_ConvertToType(interp, pathPtr, &tclFsPathType);
+     *         return Tcl_ConvertToType(interp, pathPtr, &fsPathType);
      *     }
      * }
      *
@@ -1328,7 +1328,7 @@ TclNewFSPathObj(
 
     SETPATHOBJ(pathPtr, fsPathPtr);
     PATHFLAGS(pathPtr) = TCLPATH_APPENDED;
-    pathPtr->typePtr = &tclFsPathType;
+    pathPtr->typePtr = &fsPathType;
     pathPtr->bytes = NULL;
     pathPtr->length = 0;
 
@@ -1431,7 +1431,7 @@ TclFSMakePathRelative(
     int cwdLen, len;
     const char *tempStr;
 
-    if (pathPtr->typePtr == &tclFsPathType) {
+    if (pathPtr->typePtr == &fsPathType) {
 	FsPath *fsPathPtr = PATHOBJ(pathPtr);
 
 	if (PATHFLAGS(pathPtr) != 0 && fsPathPtr->cwdPtr == cwdPtr) {
@@ -1499,7 +1499,7 @@ MakePathFromNormalized(
 {
     FsPath *fsPathPtr;
 
-    if (pathPtr->typePtr == &tclFsPathType) {
+    if (pathPtr->typePtr == &fsPathType) {
 	return TCL_OK;
     }
 
@@ -1544,7 +1544,7 @@ MakePathFromNormalized(
 
     SETPATHOBJ(pathPtr, fsPathPtr);
     PATHFLAGS(pathPtr) = 0;
-    pathPtr->typePtr = &tclFsPathType;
+    pathPtr->typePtr = &fsPathType;
 
     return TCL_OK;
 }
@@ -1621,7 +1621,7 @@ Tcl_FSNewNativePath(
 
     SETPATHOBJ(pathPtr, fsPathPtr);
     PATHFLAGS(pathPtr) = 0;
-    pathPtr->typePtr = &tclFsPathType;
+    pathPtr->typePtr = &fsPathType;
 
     return pathPtr;
 }
@@ -1675,7 +1675,7 @@ Tcl_FSGetTranslatedPath(
 	    retObj = Tcl_FSJoinToPath(translatedCwdPtr, 1,
 		    &srcFsPathPtr->normPathPtr);
 	    srcFsPathPtr->translatedPathPtr = retObj;
-	    if (translatedCwdPtr->typePtr == &tclFsPathType) {
+	    if (translatedCwdPtr->typePtr == &fsPathType) {
 		srcFsPathPtr->filesystemEpoch
 			= PATHOBJ(translatedCwdPtr)->filesystemEpoch;
 	    } else {
@@ -1846,7 +1846,7 @@ Tcl_FSGetNormalizedPath(
 
 	    /*
 	     * NOTE: here we are (dangerously?) assuming that origDir points
-	     * to a Tcl_Obj with Tcl_ObjType == &tclFsPathType. The
+	     * to a Tcl_Obj with Tcl_ObjType == &fsPathType. The
 	     *     pathType = Tcl_FSGetPathType(fsPathPtr->cwdPtr);
 	     * above that set the pathType value should have established that,
 	     * but it's far less clear on what basis we know there's been no
@@ -2171,7 +2171,7 @@ TclFSEnsureEpochOk(
 {
     FsPath *srcFsPathPtr;
 
-    if (pathPtr->typePtr != &tclFsPathType) {
+    if (pathPtr->typePtr != &fsPathType) {
 	return TCL_OK;
     }
 
@@ -2235,7 +2235,7 @@ TclFSSetPathDetails(
      * Make sure pathPtr is of the correct type.
      */
 
-    if (pathPtr->typePtr != &tclFsPathType) {
+    if (pathPtr->typePtr != &fsPathType) {
 	if (SetFsPathFromAny(NULL, pathPtr) != TCL_OK) {
 	    return;
 	}
@@ -2334,7 +2334,7 @@ SetFsPathFromAny(
     Tcl_Obj *transPtr;
     char *name;
 
-    if (pathPtr->typePtr == &tclFsPathType) {
+    if (pathPtr->typePtr == &fsPathType) {
 	return TCL_OK;
     }
 
@@ -2496,7 +2496,7 @@ SetFsPathFromAny(
     TclFreeIntRep(pathPtr);
     SETPATHOBJ(pathPtr, fsPathPtr);
     PATHFLAGS(pathPtr) = 0;
-    pathPtr->typePtr = &tclFsPathType;
+    pathPtr->typePtr = &fsPathType;
     return TCL_OK;
 }
 
@@ -2588,7 +2588,7 @@ DupFsPathInternalRep(
     copyFsPathPtr->fsPtr = srcFsPathPtr->fsPtr;
     copyFsPathPtr->filesystemEpoch = srcFsPathPtr->filesystemEpoch;
 
-    copyPtr->typePtr = &tclFsPathType;
+    copyPtr->typePtr = &fsPathType;
 }
 
 /*
@@ -2623,8 +2623,7 @@ UpdateStringOfFsPath(
 
     pathPtr->bytes = TclGetStringFromObj(copy, &cwdLen);
     pathPtr->length = cwdLen;
-    copy->bytes = &tclEmptyString;
-    copy->length = 0;
+    TclInitStringRep(copy, NULL, 0);
     TclDecrRefCount(copy);
 }
 
@@ -2661,7 +2660,7 @@ TclNativePathInFilesystem(
      * semantics of Tcl (at present anyway), so we have to abide by them here.
      */
 
-    if (pathPtr->typePtr == &tclFsPathType) {
+    if (pathPtr->typePtr == &fsPathType) {
 	if (pathPtr->bytes != NULL && pathPtr->bytes[0] == '\0') {
 	    /*
 	     * We reject the empty path "".
@@ -2676,7 +2675,7 @@ TclNativePathInFilesystem(
     } else {
 	/*
 	 * It is somewhat unusual to reach this code path without the object
-	 * being of tclFsPathType. However, we do our best to deal with the
+	 * being of fsPathType. However, we do our best to deal with the
 	 * situation.
 	 */