Fix compiler warnings, due to the use of macro's

9 files changed, 48 insertions, 49 deletions

diff --git a/generic/tclMain.c b/generic/tclMain.c
index 2778451..02d8924 100644
--- a/generic/tclMain.c
+++ b/generic/tclMain.c
@@ -53,7 +53,7 @@ NewNativeObj(
     Tcl_DStringInit(&ds);
     Tcl_WCharToUtfDString(string, -1, &ds);
 #else
-    Tcl_ExternalToUtfDString(NULL, (char *)string, -1, &ds);
+    (void)Tcl_ExternalToUtfDString(NULL, (char *)string, -1, &ds);
 #endif
     return TclDStringToObj(&ds);
 }
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index e340202..bc51a41 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -4010,10 +4010,10 @@ TclGetProcessGlobalValue(
 
 	    Tcl_MutexLock(&pgvPtr->mutex);
 	    epoch = ++pgvPtr->epoch;
-	    Tcl_UtfToExternalDString(pgvPtr->encoding, pgvPtr->value,
-		    pgvPtr->numBytes, &native);
-	    Tcl_ExternalToUtfDString(current, Tcl_DStringValue(&native),
-	    Tcl_DStringLength(&native), &newValue);
+	    Tcl_UtfToExternalDStringEx(pgvPtr->encoding, pgvPtr->value,
+		    pgvPtr->numBytes, TCL_ENCODING_NOCOMPLAIN, &native);
+	    Tcl_ExternalToUtfDStringEx(current, Tcl_DStringValue(&native),
+	    Tcl_DStringLength(&native), TCL_ENCODING_NOCOMPLAIN, &newValue);
 	    Tcl_DStringFree(&native);
 	    Tcl_Free(pgvPtr->value);
 	    pgvPtr->value = (char *)Tcl_Alloc(Tcl_DStringLength(&newValue) + 1);
diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index a833d04..ebff94b 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -547,8 +547,8 @@ ExtractHeader(
 	    }
 	}
 
-	Tcl_ExternalToUtfDString(latin1enc, (char *) headerPtr->comment, -1,
-		&tmp);
+	Tcl_ExternalToUtfDStringEx(latin1enc, (char *) headerPtr->comment, -1,
+		TCL_ENCODING_NOCOMPLAIN, &tmp);
 	SetValue(dictObj, "comment", TclDStringToObj(&tmp));
     }
     SetValue(dictObj, "crc", Tcl_NewBooleanObj(headerPtr->hcrc));
@@ -564,8 +564,8 @@ ExtractHeader(
 	    }
 	}
 
-	Tcl_ExternalToUtfDString(latin1enc, (char *) headerPtr->name, -1,
-		&tmp);
+	Tcl_ExternalToUtfDStringEx(latin1enc, (char *) headerPtr->name, -1,
+		TCL_ENCODING_NOCOMPLAIN, &tmp);
 	SetValue(dictObj, "filename", TclDStringToObj(&tmp));
     }
     if (headerPtr->os != 255) {
diff --git a/macosx/tclMacOSXFCmd.c b/macosx/tclMacOSXFCmd.c
index a40fe3d..5030b2f 100644
--- a/macosx/tclMacOSXFCmd.c
+++ b/macosx/tclMacOSXFCmd.c
@@ -642,7 +642,7 @@ SetOSTypeFromAny(
     size_t length;
 
     string = Tcl_GetStringFromObj(objPtr, &length);
-    Tcl_UtfToExternalDString(encoding, string, length, &ds);
+    Tcl_UtfToExternalDStringEx(encoding, string, length, TCL_ENCODING_NOCOMPLAIN, &ds);
 
     if (Tcl_DStringLength(&ds) > 4) {
 	if (interp) {
diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c
index 25bc70f..933ba2a 100644
--- a/unix/tclUnixChan.c
+++ b/unix/tclUnixChan.c
@@ -1027,11 +1027,11 @@ TtyGetOptionProc(
 	tcgetattr(fsPtr->fileState.fd, &iostate);
 	Tcl_DStringInit(&ds);
 
-	Tcl_ExternalToUtfDString(NULL, (char *) &iostate.c_cc[VSTART], 1, &ds);
+	Tcl_ExternalToUtfDStringEx(NULL, (char *) &iostate.c_cc[VSTART], 1, TCL_ENCODING_NOCOMPLAIN, &ds);
 	Tcl_DStringAppendElement(dsPtr, Tcl_DStringValue(&ds));
 	TclDStringClear(&ds);
 
-	Tcl_ExternalToUtfDString(NULL, (char *) &iostate.c_cc[VSTOP], 1, &ds);
+	Tcl_ExternalToUtfDStringEx(NULL, (char *) &iostate.c_cc[VSTOP], 1, TCL_ENCODING_NOCOMPLAIN, &ds);
 	Tcl_DStringAppendElement(dsPtr, Tcl_DStringValue(&ds));
 	Tcl_DStringFree(&ds);
     }
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c
index 8707cd8..9b29725 100644
--- a/unix/tclUnixFCmd.c
+++ b/unix/tclUnixFCmd.c
@@ -762,16 +762,16 @@ TclpObjCopyDirectory(
     Tcl_Obj *transPtr;
 
     transPtr = Tcl_FSGetTranslatedPath(NULL,srcPathPtr);
-    Tcl_UtfToExternalDString(NULL,
+    Tcl_UtfToExternalDStringEx(NULL,
 	    (transPtr != NULL ? TclGetString(transPtr) : NULL),
-	    -1, &srcString);
+	    -1, TCL_ENCODING_NOCOMPLAIN, &srcString);
     if (transPtr != NULL) {
 	Tcl_DecrRefCount(transPtr);
     }
     transPtr = Tcl_FSGetTranslatedPath(NULL,destPathPtr);
-    Tcl_UtfToExternalDString(NULL,
+    Tcl_UtfToExternalDStringEx(NULL,
 	    (transPtr != NULL ? TclGetString(transPtr) : NULL),
-	    -1, &dstString);
+	    -1, TCL_ENCODING_NOCOMPLAIN, &dstString);
     if (transPtr != NULL) {
 	Tcl_DecrRefCount(transPtr);
     }
@@ -826,9 +826,9 @@ TclpObjRemoveDirectory(
     int ret;
     Tcl_Obj *transPtr = Tcl_FSGetTranslatedPath(NULL, pathPtr);
 
-    Tcl_UtfToExternalDString(NULL,
+    Tcl_UtfToExternalDStringEx(NULL,
 	    (transPtr != NULL ? TclGetString(transPtr) : NULL),
-	    -1, &pathString);
+	    -1, TCL_ENCODING_NOCOMPLAIN, &pathString);
     if (transPtr != NULL) {
 	Tcl_DecrRefCount(transPtr);
     }
@@ -886,7 +886,7 @@ DoRemoveDirectory(
     result = TCL_OK;
     if ((errno != EEXIST) || (recursive == 0)) {
 	if (errorPtr != NULL) {
-	    Tcl_ExternalToUtfDString(NULL, path, -1, errorPtr);
+	    Tcl_ExternalToUtfDStringEx(NULL, path, -1, TCL_ENCODING_NOCOMPLAIN, errorPtr);
 	}
 	result = TCL_ERROR;
     }
@@ -1135,7 +1135,7 @@ TraverseUnixTree(
   end:
     if (errfile != NULL) {
 	if (errorPtr != NULL) {
-	    Tcl_ExternalToUtfDString(NULL, errfile, -1, errorPtr);
+	    Tcl_ExternalToUtfDStringEx(NULL, errfile, -1, TCL_ENCODING_NOCOMPLAIN, errorPtr);
 	}
 	result = TCL_ERROR;
     }
@@ -1205,8 +1205,8 @@ TraversalCopy(
      */
 
     if (errorPtr != NULL) {
-	Tcl_ExternalToUtfDString(NULL, Tcl_DStringValue(dstPtr),
-		Tcl_DStringLength(dstPtr), errorPtr);
+	Tcl_ExternalToUtfDStringEx(NULL, Tcl_DStringValue(dstPtr),
+		Tcl_DStringLength(dstPtr), TCL_ENCODING_NOCOMPLAIN, errorPtr);
     }
     return TCL_ERROR;
 }
@@ -1256,8 +1256,8 @@ TraversalDelete(
 	break;
     }
     if (errorPtr != NULL) {
-	Tcl_ExternalToUtfDString(NULL, Tcl_DStringValue(srcPtr),
-		Tcl_DStringLength(srcPtr), errorPtr);
+	Tcl_ExternalToUtfDStringEx(NULL, Tcl_DStringValue(srcPtr),
+		Tcl_DStringLength(srcPtr), TCL_ENCODING_NOCOMPLAIN, errorPtr);
     }
     return TCL_ERROR;
 }
@@ -1424,7 +1424,7 @@ GetOwnerAttribute(
     } else {
 	Tcl_DString ds;
 
-	(void) Tcl_ExternalToUtfDString(NULL, pwPtr->pw_name, -1, &ds);
+	Tcl_ExternalToUtfDStringEx(NULL, pwPtr->pw_name, -1, TCL_ENCODING_NOCOMPLAIN, &ds);
 	*attributePtrPtr = TclDStringToObj(&ds);
     }
     return TCL_OK;
@@ -2086,7 +2086,7 @@ TclpObjNormalizePath(
 	     */
 
 	    Tcl_DStringFree(&ds);
-	    Tcl_ExternalToUtfDString(NULL, normPath, newNormLen, &ds);
+	    Tcl_ExternalToUtfDStringEx(NULL, normPath, newNormLen, TCL_ENCODING_NOCOMPLAIN, &ds);
 
 	    if (path[nextCheckpoint] != '\0') {
 		/*
@@ -2179,7 +2179,7 @@ TclUnixOpenTemporaryFile(
 
     if (dirObj) {
 	string = Tcl_GetStringFromObj(dirObj, &length);
-	Tcl_UtfToExternalDString(NULL, string, length, &templ);
+	Tcl_UtfToExternalDStringEx(NULL, string, length, TCL_ENCODING_NOCOMPLAIN, &templ);
     } else {
 	Tcl_DStringInit(&templ);
 	Tcl_DStringAppend(&templ, DefaultTempDir(), -1); /* INTL: native */
@@ -2189,7 +2189,7 @@ TclUnixOpenTemporaryFile(
 
     if (basenameObj) {
 	string = Tcl_GetStringFromObj(basenameObj, &length);
-	Tcl_UtfToExternalDString(NULL, string, length, &tmp);
+	Tcl_UtfToExternalDStringEx(NULL, string, length, TCL_ENCODING_NOCOMPLAIN, &tmp);
 	TclDStringAppendDString(&templ, &tmp);
 	Tcl_DStringFree(&tmp);
     } else {
@@ -2201,7 +2201,7 @@ TclUnixOpenTemporaryFile(
 #ifdef HAVE_MKSTEMPS
     if (extensionObj) {
 	string = Tcl_GetStringFromObj(extensionObj, &length);
-	Tcl_UtfToExternalDString(NULL, string, length, &tmp);
+	Tcl_UtfToExternalDStringEx(NULL, string, length, TCL_ENCODING_NOCOMPLAIN, &tmp);
 	TclDStringAppendDString(&templ, &tmp);
 	fd = mkstemps(Tcl_DStringValue(&templ), Tcl_DStringLength(&tmp));
 	Tcl_DStringFree(&tmp);
@@ -2217,8 +2217,8 @@ TclUnixOpenTemporaryFile(
     }
 
     if (resultingNameObj) {
-	Tcl_ExternalToUtfDString(NULL, Tcl_DStringValue(&templ),
-		Tcl_DStringLength(&templ), &tmp);
+	Tcl_ExternalToUtfDStringEx(NULL, Tcl_DStringValue(&templ),
+		Tcl_DStringLength(&templ), TCL_ENCODING_NOCOMPLAIN, &tmp);
 	Tcl_SetStringObj(resultingNameObj, Tcl_DStringValue(&tmp),
 		Tcl_DStringLength(&tmp));
 	Tcl_DStringFree(&tmp);
@@ -2304,7 +2304,7 @@ TclpCreateTemporaryDirectory(
 
     if (dirObj) {
 	string = TclGetString(dirObj);
-	Tcl_UtfToExternalDString(NULL, string, dirObj->length, &templ);
+	Tcl_UtfToExternalDStringEx(NULL, string, dirObj->length, TCL_ENCODING_NOCOMPLAIN, &templ);
     } else {
 	Tcl_DStringInit(&templ);
 	Tcl_DStringAppend(&templ, DefaultTempDir(), -1); /* INTL: native */
@@ -2317,7 +2317,7 @@ TclpCreateTemporaryDirectory(
     if (basenameObj) {
 	string = TclGetString(basenameObj);
 	if (basenameObj->length) {
-	    Tcl_UtfToExternalDString(NULL, string, basenameObj->length, &tmp);
+	    Tcl_UtfToExternalDStringEx(NULL, string, basenameObj->length, TCL_ENCODING_NOCOMPLAIN, &tmp);
 	    TclDStringAppendDString(&templ, &tmp);
 	    Tcl_DStringFree(&tmp);
 	} else {
@@ -2342,8 +2342,8 @@ TclpCreateTemporaryDirectory(
      * The template has been updated. Tell the caller what it was.
      */
 
-    Tcl_ExternalToUtfDString(NULL, Tcl_DStringValue(&templ),
-	    Tcl_DStringLength(&templ), &tmp);
+    Tcl_ExternalToUtfDStringEx(NULL, Tcl_DStringValue(&templ),
+	    Tcl_DStringLength(&templ), TCL_ENCODING_NOCOMPLAIN, &tmp);
     Tcl_DStringFree(&templ);
     return TclDStringToObj(&tmp);
 }
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c
index 17daa6e2..cda2cd3 100644
--- a/unix/tclUnixFile.c
+++ b/unix/tclUnixFile.c
@@ -155,7 +155,7 @@ TclpFindExecutable(
 #endif
     {
 	encoding = Tcl_GetEncoding(NULL, NULL);
-	Tcl_ExternalToUtfDString(encoding, name, -1, &utfName);
+	Tcl_ExternalToUtfDStringEx(encoding, name, -1, TCL_ENCODING_NOCOMPLAIN, &utfName);
 	TclSetObjNameOfExecutable(
 		Tcl_NewStringObj(Tcl_DStringValue(&utfName), -1), encoding);
 	Tcl_DStringFree(&utfName);
@@ -181,8 +181,8 @@ TclpFindExecutable(
     Tcl_DStringAppend(&nameString, name, -1);
 
     Tcl_DStringFree(&buffer);
-    Tcl_UtfToExternalDString(NULL, Tcl_DStringValue(&cwd),
-	    Tcl_DStringLength(&cwd), &buffer);
+    Tcl_UtfToExternalDStringEx(NULL, Tcl_DStringValue(&cwd),
+	    Tcl_DStringLength(&cwd), TCL_ENCODING_NOCOMPLAIN, &buffer);
     if (Tcl_DStringValue(&cwd)[Tcl_DStringLength(&cwd) -1] != '/') {
 	TclDStringAppendLiteral(&buffer, "/");
     }
@@ -191,8 +191,8 @@ TclpFindExecutable(
     Tcl_DStringFree(&nameString);
 
     encoding = Tcl_GetEncoding(NULL, NULL);
-    Tcl_ExternalToUtfDString(encoding, Tcl_DStringValue(&buffer), -1,
-	    &utfName);
+    Tcl_ExternalToUtfDStringEx(encoding, Tcl_DStringValue(&buffer), -1,
+	    TCL_ENCODING_NOCOMPLAIN, &utfName);
     TclSetObjNameOfExecutable(
 	    Tcl_NewStringObj(Tcl_DStringValue(&utfName), -1), encoding);
     Tcl_DStringFree(&utfName);
@@ -606,8 +606,7 @@ TclpGetUserHome(
     if (pwPtr == NULL) {
 	return NULL;
     }
-    Tcl_ExternalToUtfDString(NULL, pwPtr->pw_dir, -1, bufferPtr);
-    return Tcl_DStringValue(bufferPtr);
+    return Tcl_ExternalToUtfDString(NULL, pwPtr->pw_dir, -1, bufferPtr);
 }
 
 /*
@@ -828,7 +827,7 @@ TclpReadlink(
 	return NULL;
     }
 
-    Tcl_ExternalToUtfDString(NULL, link, length, linkPtr);
+    Tcl_ExternalToUtfDStringEx(NULL, link, length, TCL_ENCODING_NOCOMPLAIN, linkPtr);
     return Tcl_DStringValue(linkPtr);
 #else
     return NULL;
@@ -997,7 +996,7 @@ TclpObjLink(
 	    return NULL;
 	}
 
-	Tcl_ExternalToUtfDString(NULL, link, length, &ds);
+	Tcl_ExternalToUtfDStringEx(NULL, link, length, TCL_ENCODING_NOCOMPLAIN, &ds);
 	linkPtr = TclDStringToObj(&ds);
 	Tcl_IncrRefCount(linkPtr);
 	return linkPtr;
@@ -1062,7 +1061,7 @@ TclpNativeToNormalized(
 {
     Tcl_DString ds;
 
-    Tcl_ExternalToUtfDString(NULL, (const char *) clientData, -1, &ds);
+    Tcl_ExternalToUtfDStringEx(NULL, (const char *) clientData, -1, TCL_ENCODING_NOCOMPLAIN, &ds);
     return TclDStringToObj(&ds);
 }
 
@@ -1116,7 +1115,7 @@ TclNativeCreateNativeRep(
     }
 
     str = Tcl_GetStringFromObj(validPathPtr, &len);
-    Tcl_UtfToExternalDString(NULL, str, len, &ds);
+    Tcl_UtfToExternalDStringEx(NULL, str, len, TCL_ENCODING_NOCOMPLAIN, &ds);
     len = Tcl_DStringLength(&ds) + sizeof(char);
     if (strlen(Tcl_DStringValue(&ds)) < len - sizeof(char)) {
 	/* See bug [3118489]: NUL in filenames */
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index f8bca0f..8486e57 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -473,7 +473,7 @@ TclpInitLibraryPath(
      */
 
     str = getenv("TCL_LIBRARY");			/* INTL: Native. */
-    Tcl_ExternalToUtfDString(NULL, str, -1, &buffer);
+    Tcl_ExternalToUtfDStringEx(NULL, str, -1, TCL_ENCODING_NOCOMPLAIN, &buffer);
     str = Tcl_DStringValue(&buffer);
 
     if ((str != NULL) && (str[0] != '\0')) {
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index 61c1010..5e3b7f4 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -388,8 +388,8 @@ InitializeHostName(
 	    Tcl_DStringSetLength(&inDs, 256);
 	    if (gethostname(Tcl_DStringValue(&inDs),
 		    Tcl_DStringLength(&inDs)) == 0) {
-		Tcl_ExternalToUtfDString(NULL, Tcl_DStringValue(&inDs), -1,
-			&ds);
+		Tcl_ExternalToUtfDStringEx(NULL, Tcl_DStringValue(&inDs), -1,
+			TCL_ENCODING_NOCOMPLAIN, &ds);
 	    }
 	    Tcl_DStringFree(&inDs);
 	}