From 2d34656de08ad9831a1d29466ceeb4f532aa3b3f Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 22 Oct 2023 19:49:24 +0000
Subject: Remaining fixes for [26870862f0]: Wrong sentinel in Tcl_SetErrorCode
 usage

---
 generic/tclBinary.c   | 4 ++--
 generic/tclCompile.c  | 2 +-
 generic/tclIOGT.c     | 2 +-
 generic/tclObj.c      | 6 +++---
 generic/tclScan.c     | 2 +-
 generic/tclStubInit.c | 8 ++++----
 generic/tclUtil.c     | 7 +------
 7 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index f97c3c7..a09eacb 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -400,7 +400,7 @@ TclGetBytesFromObj(
 	    if (interp) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"byte sequence length exceeds INT_MAX", -1));
-		Tcl_SetErrorCode(interp, "TCL", "API", "OUTDATED", NULL);
+		Tcl_SetErrorCode(interp, "TCL", "API", "OUTDATED", (void *)NULL);
 	    }
 	    return NULL;
 	} else {
@@ -519,7 +519,7 @@ MakeByteArray(
 			    "expected byte sequence but character %"
 			    TCL_Z_MODIFIER "u was '%1s' (U+%06X)",
 			    dst - byteArrayPtr->bytes, src, ch));
-		    Tcl_SetErrorCode(interp, "TCL", "VALUE", "BYTES", NULL);
+		    Tcl_SetErrorCode(interp, "TCL", "VALUE", "BYTES", (void *)NULL);
 		}
 		Tcl_Free(byteArrayPtr);
 		*byteArrayPtrPtr = NULL;
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index 5ff0c18..e93fd4a 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -2197,7 +2197,7 @@ TclCompileScript(
 	  Tcl_ObjPrintf("Script length %" TCL_SIZE_MODIFIER
 			   "d exceeds max permitted length %d.",
 			   numBytes, INT_MAX-1));
-	    Tcl_SetErrorCode(interp, "TCL", "LIMIT", "SCRIPTLENGTH", NULL);
+	    Tcl_SetErrorCode(interp, "TCL", "LIMIT", "SCRIPTLENGTH", (void *)NULL);
 	    TclCompileSyntaxError(interp, envPtr);
 	    return;
       }
diff --git a/generic/tclIOGT.c b/generic/tclIOGT.c
index f577599..b2b959d 100644
--- a/generic/tclIOGT.c
+++ b/generic/tclIOGT.c
@@ -474,7 +474,7 @@ ExecuteCallback(
 	}
 	nonBytes:
 	Tcl_AppendResult(interp, "chan transform callback received non-bytes",
-		NULL);
+		(void *)NULL);
 	Tcl_Release(eval);
 	return TCL_ERROR;
 
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 5ae433e..aed24cd 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -3658,9 +3658,9 @@ Tcl_GetNumber(
     }
     if (numBytes > INT_MAX) {
 	if (interp) {
-            Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-                    "max size for a Tcl value (%d bytes) exceeded", INT_MAX));
-	    Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "max size for a Tcl value (%d bytes) exceeded", INT_MAX));
+	    Tcl_SetErrorCode(interp, "TCL", "MEMORY", (void *)NULL);
 	}
 	return TCL_ERROR;
     }
diff --git a/generic/tclScan.c b/generic/tclScan.c
index 17fd1a9..222b06d 100644
--- a/generic/tclScan.c
+++ b/generic/tclScan.c
@@ -368,7 +368,7 @@ ValidateFormat(
 				  ull,
 				  (Tcl_Size)TCL_SIZE_MAX-1));
 		Tcl_SetErrorCode(
-		    interp, "TCL", "FORMAT", "WIDTHLIMIT", NULL);
+		    interp, "TCL", "FORMAT", "WIDTHLIMIT", (void *)NULL);
 		goto error;
 	    }
 	    flags |= SCAN_WIDTH;
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 4ed0651..754023c 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -112,7 +112,7 @@ int TclListObjGetElements(Tcl_Interp *interp, Tcl_Obj *listPtr,
     if (objcPtr) {
 	if ((sizeof(int) != sizeof(size_t)) && (result == TCL_OK) && (n > INT_MAX)) {
 	    if (interp) {
-		Tcl_AppendResult(interp, "List too large to be processed", NULL);
+		Tcl_AppendResult(interp, "List too large to be processed", (void *)NULL);
 	    }
 	    return TCL_ERROR;
 	}
@@ -127,7 +127,7 @@ int TclListObjLength(Tcl_Interp *interp, Tcl_Obj *listPtr,
     if (lengthPtr) {
 	if ((sizeof(int) != sizeof(size_t)) && (result == TCL_OK) && (n > INT_MAX)) {
 	    if (interp) {
-		Tcl_AppendResult(interp, "List too large to be processed", NULL);
+		Tcl_AppendResult(interp, "List too large to be processed", (void *)NULL);
 	    }
 	    return TCL_ERROR;
 	}
@@ -142,7 +142,7 @@ int TclDictObjSize(Tcl_Interp *interp, Tcl_Obj *dictPtr,
     if (sizePtr) {
 	if ((sizeof(int) != sizeof(size_t)) && (result == TCL_OK) && (n > INT_MAX)) {
 	    if (interp) {
-		Tcl_AppendResult(interp, "Dict too large to be processed", NULL);
+		Tcl_AppendResult(interp, "Dict too large to be processed", (void *)NULL);
 	    }
 	    return TCL_ERROR;
 	}
@@ -157,7 +157,7 @@ int TclSplitList(Tcl_Interp *interp, const char *listStr, void *argcPtr,
     if (argcPtr) {
 	if ((sizeof(int) != sizeof(size_t)) && (result == TCL_OK) && (n > INT_MAX)) {
 	    if (interp) {
-		Tcl_AppendResult(interp, "List too large to be processed", NULL);
+		Tcl_AppendResult(interp, "List too large to be processed", (void *)NULL);
 	    }
 	    Tcl_Free((void *)*argvPtr);
 	    return TCL_ERROR;
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 4f1a741..579d822 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -3925,12 +3925,7 @@ rangeerror:
 	Tcl_SetObjResult(
 	    interp,
 	    Tcl_ObjPrintf("index \"%s\" out of range", TclGetString(objPtr)));
-	Tcl_SetErrorCode(interp,
-			 "TCL",
-			 "VALUE",
-			 "INDEX"
-			 "OUTOFRANGE",
-			 NULL);
+	Tcl_SetErrorCode(interp, "TCL", "VALUE", "INDEX", "OUTOFRANGE", (void *)NULL);
     }
     return TCL_ERROR;
 }
-- 
cgit v0.12