Merge 8.7. Tcl_GetStringFromObj() -> TclGetStringFromObj() (optimization)

1 files changed, 16 insertions, 16 deletions

diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 10faa02..5fe6ef7 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -1473,7 +1473,7 @@ Tcl_AppendObjToObj(
 
 	    AppendUnicodeToUnicodeRep(objPtr, unicode, numChars);
 	} else {
-	    bytes = Tcl_GetStringFromObj(appendObjPtr, &length);
+	    bytes = TclGetStringFromObj(appendObjPtr, &length);
 	    AppendUtfToUnicodeRep(objPtr, bytes, length);
 	}
 	return;
@@ -1485,7 +1485,7 @@ Tcl_AppendObjToObj(
      * characters in the final (appended-to) object.
      */
 
-    bytes = Tcl_GetStringFromObj(appendObjPtr, &length);
+    bytes = TclGetStringFromObj(appendObjPtr, &length);
 
     numChars = stringPtr->numChars;
     if ((numChars >= 0) && TclHasInternalRep(appendObjPtr, &tclStringType)) {
@@ -1864,7 +1864,7 @@ Tcl_AppendFormatToObj(
     if (Tcl_IsShared(appendObj)) {
 	Tcl_Panic("%s called with shared object", "Tcl_AppendFormatToObj");
     }
-    (void)Tcl_GetStringFromObj(appendObj, &originalLength);
+    (void)TclGetStringFromObj(appendObj, &originalLength);
     limit = TCL_SIZE_MAX - originalLength;
 
     /*
@@ -2292,7 +2292,7 @@ Tcl_AppendFormatToObj(
 		    TclNewIntObj(pure, l);
 		}
 		Tcl_IncrRefCount(pure);
-		bytes = Tcl_GetStringFromObj(pure, &length);
+		bytes = TclGetStringFromObj(pure, &length);
 
 		/*
 		 * Already did the sign above.
@@ -2578,7 +2578,7 @@ Tcl_AppendFormatToObj(
 	    }
 	}
 
-	(void)Tcl_GetStringFromObj(segment, &segmentNumBytes);
+	(void)TclGetStringFromObj(segment, &segmentNumBytes);
 	if (segmentNumBytes > limit) {
 	    if (allocSegment) {
 		Tcl_DecrRefCount(segment);
@@ -2961,7 +2961,7 @@ TclGetStringStorage(
     String *stringPtr;
 
     if (!TclHasInternalRep(objPtr, &tclStringType) || objPtr->bytes == NULL) {
-	return Tcl_GetStringFromObj(objPtr, sizePtr);
+	return TclGetStringFromObj(objPtr, sizePtr);
     }
 
     stringPtr = GET_STRING(objPtr);
@@ -3027,7 +3027,7 @@ TclStringRepeat(
 	maxCount = TCL_SIZE_MAX/sizeof(Tcl_UniChar);
     } else {
 	/* Result will be concat of string reps. Pre-size it. */
-	(void)Tcl_GetStringFromObj(objPtr, &length);
+	(void)TclGetStringFromObj(objPtr, &length);
 	maxCount = TCL_SIZE_MAX;
     }
 
@@ -3287,7 +3287,7 @@ TclStringCat(
 		    /* No string rep; Take the chance we can avoid making it */
 		    pendingPtr = objPtr;
 		} else {
-		    (void) Tcl_GetStringFromObj(objPtr, &length); /* PANIC? */
+		    (void) TclGetStringFromObj(objPtr, &length); /* PANIC? */
 		}
 	    } while (--oc && (length == 0) && (pendingPtr == NULL));
 
@@ -3311,14 +3311,14 @@ TclStringCat(
 
 		do {
 		    Tcl_Obj *objPtr = *ov++;
-		    (void)Tcl_GetStringFromObj(objPtr, &numBytes); /* PANIC? */
+		    (void)TclGetStringFromObj(objPtr, &numBytes); /* PANIC? */
 		} while (--oc && numBytes == 0 && pendingPtr->bytes == NULL);
 
 		if (numBytes) {
 		    last = objc -oc -1;
 		}
 		if (oc || numBytes) {
-		    (void)Tcl_GetStringFromObj(pendingPtr, &length);
+		    (void)TclGetStringFromObj(pendingPtr, &length);
 		}
 		if (length == 0) {
 		    if (numBytes) {
@@ -3452,7 +3452,7 @@ TclStringCat(
 
 	    objResultPtr = *objv++; objc--;
 
-	    (void)Tcl_GetStringFromObj(objResultPtr, &start);
+	    (void)TclGetStringFromObj(objResultPtr, &start);
 	    if (0 == Tcl_AttemptSetObjLength(objResultPtr, length)) {
 		if (interp) {
 		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -3484,7 +3484,7 @@ TclStringCat(
 
 	    if ((objPtr->bytes == NULL) || (objPtr->length)) {
 		Tcl_Size more;
-		char *src = Tcl_GetStringFromObj(objPtr, &more);
+		char *src = TclGetStringFromObj(objPtr, &more);
 
 		memcpy(dst, src, more);
 		dst += more;
@@ -3719,7 +3719,7 @@ TclStringCmp(
 		case -1:
 		    s1 = 0;
 		    s1len = 0;
-		    s2 = Tcl_GetStringFromObj(value2Ptr, &s2len);
+		    s2 = TclGetStringFromObj(value2Ptr, &s2len);
 		    break;
 		case 0:
 		    match = -1;
@@ -3734,7 +3734,7 @@ TclStringCmp(
 		case -1:
 		    s2 = 0;
 		    s2len = 0;
-		    s1 = Tcl_GetStringFromObj(value1Ptr, &s1len);
+		    s1 = TclGetStringFromObj(value1Ptr, &s1len);
 		    break;
 		case 0:
 		    match = 1;
@@ -3745,8 +3745,8 @@ TclStringCmp(
 		    goto matchdone;
 		}
 	    } else {
-		s1 = Tcl_GetStringFromObj(value1Ptr, &s1len);
-		s2 = Tcl_GetStringFromObj(value2Ptr, &s2len);
+		s1 = TclGetStringFromObj(value1Ptr, &s1len);
+		s2 = TclGetStringFromObj(value2Ptr, &s2len);
 	    }
 	    if (!nocase && checkEq && reqlength < 0) {
 		/*