From: drh <drh@noemail.net>
Date: Tue, 24 Nov 2015 18:04:39 +0000 (+0000)
Subject: Fix harmless compiler warnings in the TCL test harness logic.
X-Git-Tag: version-3.10.0~102^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=060f9a4a18cb3b26e6bf5d37edeb6d92ee5eb2d0;p=thirdparty%2Fsqlite.git

Fix harmless compiler warnings in the TCL test harness logic.

FossilOrigin-Name: 2fba7a96566b5448f527a4ec6a26e860c4889813
---

diff --git a/manifest b/manifest
index 19ec7c82ff..bf1a2b9a42 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
-D 2015-11-24T17:44:26.959
+C Fix\sharmless\scompiler\swarnings\sin\sthe\sTCL\stest\sharness\slogic.
+D 2015-11-24T18:04:39.335
 F Makefile.in d828db6afa6c1fa060d01e33e4674408df1942a1
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e928e68168df69b353300ac87c10105206653a03
@@ -389,7 +389,7 @@ F src/test_server.c a2615049954cbb9cfb4a62e18e2f0616e4dc38fe
 F src/test_sqllog.c 0d138a8180a312bf996b37fa66da5c5799d4d57b
 F src/test_superlock.c 06797157176eb7085027d9dd278c0d7a105e3ec9
 F src/test_syscall.c 2e21ca7f7dc54a028f1967b63f1e76155c356f9b
-F src/test_tclvar.c 2fd910e9f0ef7686889f50f448d33810c895da86
+F src/test_tclvar.c d86412527da65468ee6fa1b8607c65d0af736bc4
 F src/test_thread.c af391ec03d23486dffbcc250b7e58e073f172af9
 F src/test_vfs.c 3b65d42e18b262805716bd96178c81da8f2d9283
 F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
@@ -1405,7 +1405,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P c5e9fd0dc92a07db3d3b5f5c5ad8fb63b3425c2b 20256177072caa4f2b4114038ad1c8f6e26bc562
-R f66db3dfd01f74a8efe805dce920d093
-U dan
-Z 1605220e9da94a8d162b093db7a72a24
+P 99222bb3e5f9b2a9a10d9561a9fd8c0f717baaff
+R a81a9eaa4d026b7ec9f13ce6cc6dd8d0
+U drh
+Z 1d3e92ad91e9ae564e61187f77c574d6
diff --git a/manifest.uuid b/manifest.uuid
index 8f981f6a08..72fbceb60b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-99222bb3e5f9b2a9a10d9561a9fd8c0f717baaff
\ No newline at end of file
+2fba7a96566b5448f527a4ec6a26e860c4889813
\ No newline at end of file
diff --git a/src/test_tclvar.c b/src/test_tclvar.c
index 975f07fc8d..63ed394734 100644
--- a/src/test_tclvar.c
+++ b/src/test_tclvar.c
@@ -176,19 +176,19 @@ static int tclvarFilter(
   for(i=0; idxStr[i]; i++){
     switch( idxStr[i] ){
       case TCLVAR_NAME_EQ:
-        zEq = sqlite3_value_text(argv[i]);
+        zEq = (const char*)sqlite3_value_text(argv[i]);
         break;
       case TCLVAR_NAME_MATCH:
-        zMatch = sqlite3_value_text(argv[i]);
+        zMatch = (const char*)sqlite3_value_text(argv[i]);
         break;
       case TCLVAR_VALUE_GLOB:
-        zGlob = sqlite3_value_text(argv[i]);
+        zGlob = (const char*)sqlite3_value_text(argv[i]);
         break;
       case TCLVAR_VALUE_REGEXP:
-        zRegexp = sqlite3_value_text(argv[i]);
+        zRegexp = (const char*)sqlite3_value_text(argv[i]);
         break;
       case TCLVAR_VALUE_LIKE:
-        zLike = sqlite3_value_text(argv[i]);
+        zLike = (const char*)sqlite3_value_text(argv[i]);
         break;
       default:
         assert( 0 );