More test-case cleanup. Enhance "testutfnext", so it can detect whether bytes after the string-end are read. The command will return -1 in that case. No need for additional arguments any more.

1 files changed, 4 insertions, 4 deletions

diff --git a/generic/tclTest.c b/generic/tclTest.c
index ae2d7bb..6923cd6 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -7156,12 +7156,12 @@ TestUtfNextCmd(
     if (numBytes > (int)sizeof(buffer) - 3) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"\"testutfnext\" can only handle %d bytes",
-		sizeof(buffer) - 3));
+		(int)sizeof(buffer) - 4));
 	return TCL_ERROR;
     }
 
     memcpy(buffer + 1, bytes, numBytes);
-    buffer[0] = buffer[numBytes + 1] = buffer[numBytes + 2] = '\x00';
+    buffer[0] = buffer[numBytes + 1] = buffer[numBytes + 2] = buffer[numBytes + 3] = '\xA0';
 
     if (!Tcl_UtfCharComplete(buffer + 1, offset)) {
 	/* Cannot scan a complete sequence from the data */
@@ -7184,8 +7184,8 @@ TestUtfNextCmd(
 	/* Run Tcl_UtfNext with many more possible bytes at src[end], all should give the same result */
 	result = TclUtfNext(buffer + 1);
 	if (first != result) {
-	    Tcl_AppendResult(interp, "Tcl_UtfNext is not supposed to read src[end]", NULL);
-	    return TCL_ERROR;
+	    first = buffer;
+	    break;
 	}
     }