Fix compilation problem in test5.c (CVS 1318)

FossilOrigin-Name: 49c3c86c17bcd8132216791d7a1a17e2c6256206

diff --git a/manifest b/manifest
index 9f9bb35a7092d5723a232bb3e0a3663c8c5284ff..f61bf3387a1d71fff323f9ad1994bd1613885f57 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\scode\sto\sconvert\sbetween\sthe\svarious\ssupported\sunicode\sencoding\sschemes.\nUntested\sat\sthis\spoint.\s(CVS\s1315)
-D 2004-05-06T23:37:52
+C Fix\scompilation\sproblem\sin\stest5.c\s(CVS\s1318)
+D 2004-05-07T01:50:37
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -56,7 +56,7 @@ F src/test1.c 9aa62b89d420e6763b5e7ae89a47f6cf87370477
 F src/test2.c 9d611c45e1b07039a2bd95f5ea73178362b23229
 F src/test3.c 7d06add423e4a90ec1a2e8d02006f82081109558
 F src/test4.c 6e3e31acfaf21d66420fc35fda5b17dc0000cc8d
-F src/test5.c 8a3dd24fa84b497243014f92c6afa1ee5ac735b6
+F src/test5.c 3ff0565057b8d23e20092d5c6c0b7cb0d932c51e
 F src/tokenize.c 6676b946fd8825b67ab52140af4fdc57a70bda48
 F src/trigger.c a9927b57c865b6f3df3fb5e40c9824d722660ded
 F src/update.c 4c50328ebc127852bde8e2950eb8933234802c21
@@ -190,7 +190,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P bfb3234dc60c9152fdf0a16b887089365443f5ed
-R f2be046f24e5df4901763f3eff8c0a1b
+P 71260ff7f7030f56c292b43f83a213c65c9a184e
+R 194b5ad3e3513e70d086b1bb91cc9406
 U danielk1977
-Z 887f209fe103a2fa5cebdc4c0fa96afc
+Z f28618267aa956a5d19b9055b43e3bc5

diff --git a/manifest.uuid b/manifest.uuid
index 8296788a08dfea901cbbc957bf5c8f74d5587567..1a813c8dc97af72397fd2463c569811a66688dde 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-71260ff7f7030f56c292b43f83a213c65c9a184e
\ No newline at end of file
+49c3c86c17bcd8132216791d7a1a17e2c6256206
\ No newline at end of file

diff --git a/src/test5.c b/src/test5.c
index aa8cc26f98686d7f1b31e95360638ce05b509fbd..147253a238ca545258d9e5e3d3d0097d2b25e0c3 100644 (file)
--- a/src/test5.c
+++ b/src/test5.c
@@ -52,7 +52,7 @@ static int sqlite_utf8to16le(
 
   in = Tcl_GetByteArrayFromObj(objv[1], 0);
   out = (unsigned char *)sqlite3utf8to16le(in, -1);
-  res = Tcl_NewByteArrayObj(out, utf16_length(ret));
+  res = Tcl_NewByteArrayObj(out, utf16_length(out));
   sqliteFree(out);
 
   Tcl_SetObjResult(interp, res);
@@ -78,7 +78,7 @@ static int sqlite_utf8to16be(
 
   in = Tcl_GetByteArrayFromObj(objv[1], 0);
   out = (unsigned char *)sqlite3utf8to16be(in, -1);
-  res = Tcl_NewByteArrayObj(out, utf16_length(ret));
+  res = Tcl_NewByteArrayObj(out, utf16_length(out));
   sqliteFree(out);
 
   Tcl_SetObjResult(interp, res);
@@ -108,7 +108,7 @@ static int sqlite_utf16to16le(
   memcpy(out, in, in_len);
   
   sqlite3utf16to16le(out, -1);
-  res = Tcl_NewByteArrayObj(out, utf16_length(ret));
+  res = Tcl_NewByteArrayObj(out, utf16_length(out));
   sqliteFree(out);
 
   Tcl_SetObjResult(interp, res);
@@ -138,7 +138,7 @@ static int sqlite_utf16to16be(
   memcpy(out, in, in_len);
   
   sqlite3utf16to16be(out, -1);
-  res = Tcl_NewByteArrayObj(out, utf16_length(ret));
+  res = Tcl_NewByteArrayObj(out, utf16_length(out));
   sqliteFree(out);
 
   Tcl_SetObjResult(interp, res);
@@ -164,7 +164,7 @@ static int sqlite_utf16to8(
 
   in = Tcl_GetByteArrayFromObj(objv[1], 0);
   out = sqlite3utf16to8(in, -1);
-  res = Tcl_NewByteArrayObj(out, strlen(ret));
+  res = Tcl_NewByteArrayObj(out, strlen(out));
   sqliteFree(out);
 
   Tcl_SetObjResult(interp, res);