add testcase for "encoding convertto". Move stub table one positions

5 files changed, 16 insertions, 12 deletions

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 8cd5bc9..0dfa415 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2424,11 +2424,11 @@ declare 656 {
     const char *Tcl_UtfPrev(const char *src, const char *start)
 }
 
-declare 657 {
+declare 658 {
     size_t Tcl_ExternalToUtfDStringEx(Tcl_Encoding encoding,
 	    const char *src, int srcLen, int flags, Tcl_DString *dsPtr)
 }
-declare 658 {
+declare 659 {
     size_t Tcl_UtfToExternalDStringEx(Tcl_Encoding encoding,
 	    const char *src, int srcLen, int flags, Tcl_DString *dsPtr)
 }
diff --git a/generic/tcl.h b/generic/tcl.h
index f783f4f..e1b6066 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2080,7 +2080,7 @@ typedef struct Tcl_EncodingType {
 #define TCL_ENCODING_STOPONERROR	0x04
 #define TCL_ENCODING_NO_TERMINATE	0x08
 #define TCL_ENCODING_CHAR_LIMIT		0x10
-#define TCL_ENCODING_MODIFIED	0x20
+#define TCL_ENCODING_MODIFIED		0x20
 
 /*
  * The following definitions are the error codes returned by the conversion
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index cd77e06..df80d3c 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -583,7 +583,7 @@ EncodingConvertfromObjCmd(
     result = Tcl_ExternalToUtfDStringEx(encoding, bytesPtr, length,
 	    stopOnError ? TCL_ENCODING_STOPONERROR : 0, &ds);
     if (stopOnError && (result != (size_t)-1)) {
-    Tcl_SetObjResult(interp, Tcl_ObjPrintf("encoding error after reading %"
+    Tcl_SetObjResult(interp, Tcl_ObjPrintf("decoding error after reading %"
 	    TCL_LL_MODIFIER "u byte%s", (long long)result, (result != 1)?"s":""));
 	Tcl_DStringFree(&ds);
 	return TCL_ERROR;
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 24760f9..6ee645d 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -1937,11 +1937,12 @@ EXTERN int		Tcl_UtfCharComplete(const char *src, int length);
 EXTERN const char *	Tcl_UtfNext(const char *src);
 /* 656 */
 EXTERN const char *	Tcl_UtfPrev(const char *src, const char *start);
-/* 657 */
+/* Slot 657 is reserved */
+/* 658 */
 EXTERN size_t		Tcl_ExternalToUtfDStringEx(Tcl_Encoding encoding,
 				const char *src, int srcLen, int flags,
 				Tcl_DString *dsPtr);
-/* 658 */
+/* 659 */
 EXTERN size_t		Tcl_UtfToExternalDStringEx(Tcl_Encoding encoding,
 				const char *src, int srcLen, int flags,
 				Tcl_DString *dsPtr);
@@ -2637,8 +2638,9 @@ typedef struct TclStubs {
     int (*tcl_UtfCharComplete) (const char *src, int length); /* 654 */
     const char * (*tcl_UtfNext) (const char *src); /* 655 */
     const char * (*tcl_UtfPrev) (const char *src, const char *start); /* 656 */
-    size_t (*tcl_ExternalToUtfDStringEx) (Tcl_Encoding encoding, const char *src, int srcLen, int flags, Tcl_DString *dsPtr); /* 657 */
-    size_t (*tcl_UtfToExternalDStringEx) (Tcl_Encoding encoding, const char *src, int srcLen, int flags, Tcl_DString *dsPtr); /* 658 */
+    void (*reserved657)(void);
+    size_t (*tcl_ExternalToUtfDStringEx) (Tcl_Encoding encoding, const char *src, int srcLen, int flags, Tcl_DString *dsPtr); /* 658 */
+    size_t (*tcl_UtfToExternalDStringEx) (Tcl_Encoding encoding, const char *src, int srcLen, int flags, Tcl_DString *dsPtr); /* 659 */
 } TclStubs;
 
 extern const TclStubs *tclStubsPtr;
@@ -3981,10 +3983,11 @@ extern const TclStubs *tclStubsPtr;
 	(tclStubsPtr->tcl_UtfNext) /* 655 */
 #define Tcl_UtfPrev \
 	(tclStubsPtr->tcl_UtfPrev) /* 656 */
+/* Slot 657 is reserved */
 #define Tcl_ExternalToUtfDStringEx \
-	(tclStubsPtr->tcl_ExternalToUtfDStringEx) /* 657 */
+	(tclStubsPtr->tcl_ExternalToUtfDStringEx) /* 658 */
 #define Tcl_UtfToExternalDStringEx \
-	(tclStubsPtr->tcl_UtfToExternalDStringEx) /* 658 */
+	(tclStubsPtr->tcl_UtfToExternalDStringEx) /* 659 */
 
 #endif /* defined(USE_TCL_STUBS) */
 
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 0473bb1..54ab4b6 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -1932,8 +1932,9 @@ const TclStubs tclStubs = {
     Tcl_UtfCharComplete, /* 654 */
     Tcl_UtfNext, /* 655 */
     Tcl_UtfPrev, /* 656 */
-    Tcl_ExternalToUtfDStringEx, /* 657 */
-    Tcl_UtfToExternalDStringEx, /* 658 */
+    0, /* 657 */
+    Tcl_ExternalToUtfDStringEx, /* 658 */
+    Tcl_UtfToExternalDStringEx, /* 659 */
 };
 
 /* !END!: Do not edit above this line. */