From aec96db0167170b47c7f0dd132fd530354aa4ac7 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Wed, 12 Oct 2016 16:58:20 +0000
Subject: Reduce direct use of the tclEmptyStringRep.

---
 generic/tclPathObj.c |  3 +--
 generic/tclUtil.c    |  6 +++---
 unix/tclUnixSock.c   | 15 +++++++++------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index ce371bd..fcf4dee 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -2608,8 +2608,7 @@ UpdateStringOfFsPath(
 
     pathPtr->bytes = TclGetStringFromObj(copy, &cwdLen);
     pathPtr->length = cwdLen;
-    copy->bytes = tclEmptyStringRep;
-    copy->length = 0;
+    TclInitStringRep(copy, NULL, 0);
     TclDecrRefCount(copy);
 }
 
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index b2749c3..c726174 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -1383,9 +1383,9 @@ TclConvertElement(
      */
 
     if ((src == NULL) || (length == 0) || (*src == '\0' && length == -1)) {
-	src = tclEmptyStringRep;
-	length = 0;
-	conversion = CONVERT_BRACE;
+	p[0] = '{';
+	p[1] = '}';
+	return 2;
     }
 
     /*
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 5d11a28..44825fc 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -239,9 +239,6 @@ InitializeHostName(
 	    native = u.nodename;
         }
     }
-    if (native == NULL) {
-	native = tclEmptyStringRep;
-    }
 #else /* !NO_UNAME */
     /*
      * Uname doesn't exist; try gethostname instead.
@@ -270,9 +267,15 @@ InitializeHostName(
 #endif /* NO_UNAME */
 
     *encodingPtr = Tcl_GetEncoding(NULL, NULL);
-    *lengthPtr = strlen(native);
-    *valuePtr = ckalloc((*lengthPtr) + 1);
-    memcpy(*valuePtr, native, (size_t)(*lengthPtr)+1);
+    if (native) {
+	*lengthPtr = strlen(native);
+	*valuePtr = ckalloc((*lengthPtr) + 1);
+	memcpy(*valuePtr, native, (size_t)(*lengthPtr)+1);
+    } else {
+	*lengthPtr = 0;
+	*valuePtr = ckalloc(1);
+	*valuePtr[0] = '\0';
+    }
 }
 
 /*
-- 
cgit v0.12