Remove a C++ism from the test harness. Get the TCL interface working with

older versions of TCL. (CVS 4075)

FossilOrigin-Name: c8beb8674e5a1effc2785f205124628fbdaf57e0

diff --git a/manifest b/manifest
index 31e780b1f2bea6b009f91b9ed1bf75cd33da592f..eb42453292a002ec6980846536dae18880b598cd 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\sscript\sfor\s"soak"\stesting.\s(CVS\s4074)
-D 2007-06-15T18:43:37
+C Remove\sa\sC++ism\sfrom\sthe\stest\sharness.\s\sGet\sthe\sTCL\sinterface\sworking\swith\nolder\sversions\sof\sTCL.\s(CVS\s4075)
+D 2007-06-15T18:53:14
 F Makefile.in b9971ab07868cf2b3209fe3bf8c52e7e25af4193
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -108,8 +108,8 @@ F src/sqlite.h.in 6bd26a1429d96d72bb0e2c72fdd323defa2f558a
 F src/sqlite3ext.h 7d0d363ea7327e817ef0dfe1b7eee1f171b72890
 F src/sqliteInt.h 208c40b6e11925a321ec159d889e0ec06b618359
 F src/table.c a8de75bcedf84d4060d804264b067ab3b1a3561d
-F src/tclsqlite.c 1f3357fdf41fbab9bf82e18b6068b12a8112841e
-F src/test1.c 0ec120a4652ee95268a5a45e1e1adee13be9ae28
+F src/tclsqlite.c 9f96385c5047b24afa7601ea4055aae97c3e25e3
+F src/test1.c d2535b40abb1f2ec0070a3f5eb03bfe3ac4c4c12
 F src/test2.c 24458b17ab2f3c90cbc1c8446bd7ffe69be62f88
 F src/test3.c a280931fb40222b7c90da45eea926459beee8904
 F src/test4.c 8b784cd82de158a2317cb4ac4bc86f91ad315e25
@@ -506,7 +506,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P d0de32e4c630c43ecd9d5e5296ae84aeff80c083
-R 2ce4a0a4c9a1d5de925f69953c5edccd
+P d4ea1287a8b013a97fcb55bb7f7feba427222bab
+R fb0bc720cbbdd7938b682792dc443232
 U drh
-Z 9c609f75c9a70cc4fe6ed5b8b117e928
+Z c9a4217acd60e058e2ac96a76af7a8bc

diff --git a/manifest.uuid b/manifest.uuid
index 8a9ccd4de46003aa8b4cbf085120abc96d8d5d36..24451939ae41ac93660d1ca714907f5a23fa6d8c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d4ea1287a8b013a97fcb55bb7f7feba427222bab
\ No newline at end of file
+c8beb8674e5a1effc2785f205124628fbdaf57e0
\ No newline at end of file

diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index 0c91302d30ced7b19ea954e1f4ba6dd39faf0c40..c065be66625e0c920105413f95e63b041b692cdd 100644 (file)
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -12,7 +12,7 @@
 ** A TCL Interface to SQLite.  Append this file to sqlite3.c and
 ** compile the whole thing to build a TCL-enabled version of SQLite.
 **
-** $Id: tclsqlite.c,v 1.188 2007/06/12 18:50:14 drh Exp $
+** $Id: tclsqlite.c,v 1.189 2007/06/15 18:53:14 drh Exp $
 */
 #include "tcl.h"
 #include <errno.h>
@@ -294,7 +294,6 @@ static Tcl_ChannelType IncrblobChannelType = {
   0,                                 /* flushProc                            */
   0,                                 /* handlerProc                          */
   0,                                 /* wideSeekProc                         */
-  0,                                 /* threadActionProc                     */
 };
 
 /*

diff --git a/src/test1.c b/src/test1.c
index 1028218806d057e8ddcc080437489b7f6dd4f3a5..14c1120ce852c61e846ccf457d93e31e3a257b57 100644 (file)
--- a/src/test1.c
+++ b/src/test1.c
@@ -13,7 +13,7 @@
 ** is not included in the SQLite library.  It is used for automated
 ** testing of the SQLite library.
 **
-** $Id: test1.c,v 1.254 2007/05/17 16:34:44 danielk1977 Exp $
+** $Id: test1.c,v 1.255 2007/06/15 18:53:15 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -457,9 +457,9 @@ static int test_snprintf_int(
 ){
   char zStr[100];
   int n = atoi(argv[1]);
-  if( n>sizeof(zStr) ) n = sizeof(zStr);
   const char *zFormat = argv[2];
   int a1 = atoi(argv[3]);
+  if( n>sizeof(zStr) ) n = sizeof(zStr);
   strcpy(zStr, "abcdefghijklmnopqrstuvwxyz");
   sqlite3_snprintf(n, zStr, zFormat, a1);
   Tcl_AppendResult(interp, zStr, 0);