From 60c1d787b1f560b078850157996e356b6cc08a6c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 26 Jul 2023 15:15:22 +0000
Subject: Simplify tenviron2utfdstr(), since 2nd argument is always -1.

---
 generic/regerror.c |  1 -
 generic/tclEnv.c   | 30 ++++++++++++++----------------
 win/tclWinTest.c   |  2 +-
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/generic/regerror.c b/generic/regerror.c
index 361bd29..bc73d6a 100644
--- a/generic/regerror.c
+++ b/generic/regerror.c
@@ -54,7 +54,6 @@ static const struct rerr {
 /*
  - regerror - the interface to error numbers
  */
-/* ARGSUSED */
 size_t				/* Actual space needed (including NUL) */
 regerror(
     int code,			/* Error code, or REG_ATOI or REG_ITOA */
diff --git a/generic/tclEnv.c b/generic/tclEnv.c
index e9f7d7d..7d0c61c 100644
--- a/generic/tclEnv.c
+++ b/generic/tclEnv.c
@@ -19,20 +19,20 @@ TCL_DECLARE_MUTEX(envMutex)	/* To serialize access to environ. */
 
 #if defined(_WIN32)
 #  define tenviron _wenviron
-#  define tenviron2utfdstr(tenvstr, len, dstr) \
-		Tcl_WinTCharToUtf((TCHAR *)tenvstr, len, dstr)
-#  define utf2tenvirondstr(str, len, dstr) \
-		(const WCHAR *)Tcl_WinUtfToTChar(str, len, dstr)
+#  define tenviron2utfdstr(str, dsPtr) \
+		Tcl_WinTCharToUtf((TCHAR *)str, -1, dsPtr)
+#  define utf2tenvirondstr(str, dsPtr) \
+		(const WCHAR *)Tcl_WinUtfToTChar(str, -1, dsPtr)
 #  define techar WCHAR
 #  ifdef USE_PUTENV
 #    define putenv(env) _wputenv((const wchar_t *)env)
 #  endif
 #else
 #  define tenviron environ
-#  define tenviron2utfdstr(tenvstr, len, dstr) \
-		Tcl_ExternalToUtfDString(NULL, tenvstr, len, dstr)
-#  define utf2tenvirondstr(str, len, dstr) \
-		Tcl_UtfToExternalDString(NULL, str, len, dstr)
+#  define tenviron2utfdstr(str, dsPtr) \
+		Tcl_ExternalToUtfDString(NULL, str, -1, dsPtr)
+#  define utf2tenvirondstr(str, dsPtr) \
+		Tcl_UtfToExternalDString(NULL, str, -1, dsPtr)
 #  define techar char
 #endif
 
@@ -159,7 +159,7 @@ TclSetupEnv(
 	    const char *p1;
 	    char *p2;
 
-	    p1 = tenviron2utfdstr(tenviron[i], -1, &envString);
+	    p1 = tenviron2utfdstr(tenviron[i], &envString);
 	    p2 = (char *)strchr(p1, '=');
 	    if (p2 == NULL) {
 		/*
@@ -301,7 +301,7 @@ TclSetEnv(
 	 * interpreters.
 	 */
 
-	oldEnv = tenviron2utfdstr(tenviron[index], -1, &envString);
+	oldEnv = tenviron2utfdstr(tenviron[index], &envString);
 	if (strcmp(value, oldEnv + (length + 1)) == 0) {
 	    Tcl_DStringFree(&envString);
 	    Tcl_MutexUnlock(&envMutex);
@@ -324,7 +324,7 @@ TclSetEnv(
     memcpy(p, name, nameLength);
     p[nameLength] = '=';
     memcpy(p+nameLength+1, value, valueLength+1);
-    p2 = utf2tenvirondstr(p, -1, &envString);
+    p2 = utf2tenvirondstr(p, &envString);
 
     /*
      * Copy the native string to heap memory.
@@ -462,8 +462,7 @@ TclUnsetEnv(
     const char *name)		/* Name of variable to remove (UTF-8). */
 {
     char *oldValue;
-    int length;
-    int index;
+    int length, index;
 #ifdef USE_PUTENV_FOR_UNSET
     Tcl_DString envString;
     char *string;
@@ -512,7 +511,7 @@ TclUnsetEnv(
     string[length] = '\0';
 #endif /* _WIN32 */
 
-    utf2tenvirondstr(string, -1, &envString);
+    utf2tenvirondstr(string, &envString);
     string = (char *)ckrealloc(string, Tcl_DStringLength(&envString) + tNTL);
     memcpy(string, Tcl_DStringValue(&envString),
 	    Tcl_DStringLength(&envString) + tNTL);
@@ -587,7 +586,7 @@ TclGetEnv(
     if (index != -1) {
 	Tcl_DString envStr;
 
-	result = tenviron2utfdstr(tenviron[index], -1, &envStr);
+	result = tenviron2utfdstr(tenviron[index], &envStr);
 	result += length;
 	if (*result == '=') {
 	    result++;
@@ -624,7 +623,6 @@ TclGetEnv(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static char *
 EnvTraceProc(
     ClientData clientData,	/* Not used. */
diff --git a/win/tclWinTest.c b/win/tclWinTest.c
index 6ca49f6..a6143c9 100644
--- a/win/tclWinTest.c
+++ b/win/tclWinTest.c
@@ -584,7 +584,7 @@ TestplatformChmod(
     /* Add in size required for each ACE entry in the ACL */
     for (i = 0; i < nSids; ++i) {
 	newAclSize +=
-	    offsetof(ACCESS_ALLOWED_ACE, SidStart) + aceEntry[i].sidLen;
+	    TclOffset(ACCESS_ALLOWED_ACE, SidStart) + aceEntry[i].sidLen;
     }
     newAcl = (PACL)ckalloc(newAclSize);
     if (!InitializeAcl(newAcl, newAclSize, ACL_REVISION)) {
-- 
cgit v0.12