From: drh <>
Date: Wed, 31 Jul 2024 19:57:22 +0000 (+0000)
Subject: More tweaks to testfixture-implemented TCL commands to make them safe for Tcl9.
X-Git-Tag: version-3.47.0~273^2~4^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed1b616f4a07559fdaaa1668567990ff122ff439;p=thirdparty%2Fsqlite.git

More tweaks to testfixture-implemented TCL commands to make them safe for Tcl9.

FossilOrigin-Name: 67897ca97d8c98e119a498a3adb39548a579e12ee477e9dd74e9564a6f5e4c2b
---

diff --git a/manifest b/manifest
index 9f60154a7c..f8763a7bff 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Under\sTcl9,\sthe\s%x\sformat\sletter\struncates\sto\s32-bits.\s\sMust\suse\s%llx\sin\sorder\nto\sget\sa\s64-bit\srendering.
-D 2024-07-31T19:56:14.739
+C More\stweaks\sto\stestfixture-implemented\sTCL\scommands\sto\smake\sthem\ssafe\sfor\sTcl9.
+D 2024-07-31T19:57:22.447
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -770,7 +770,7 @@ F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 F src/tclsqlite.c 6242341191e43952a8ed466b1ee4993cad3a2b93ec3e4a5e826f0b06225a6716
 F src/tclsqlite.h 4ed60ea4084b2ea46e19ab13857b3f39d33250ebbf5b2df62b0999bb9b2766b7
-F src/test1.c 78b1f09c410ccc88d55c9fc7d4128a8ff5006b7118cf640458e6df1893ec6e24
+F src/test1.c 51159784f29d3dfd4b50fd6ed9c43c8f7f36925c501a3ad3083528e5e5544bd7
 F src/test2.c 7ebc518e6735939d8979273a6f7b1d9b5702babf059f6ad62499f7f60a9eb9a3
 F src/test3.c e7573aa0f78ee4e070a4bc8c3493941c1aa64d5c66d4825c74c0f055451f432b
 F src/test4.c 13e57ae7ec7a959ee180970aef09deed141252fe9bb07c61054f0dfa4f1dfd5d
@@ -2200,8 +2200,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 66f61c3b35383b2575774d309043a722cc87a53d03518d339d6dbdcf342adc93
-R 3754410baf7d81a240b5f3745d6a91b6
+P a3044e0ae65c099d76bf04536e223e70d89971688627c342252951f6c65f49d1
+R 0254aafb585571107527e25f3f3685a5
 U drh
-Z f4de28c04f76ade84e47b56a0971adc2
+Z 7b3931730652d7e33f08dab109d8bc57
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9d482f6a5e..814d44eaf0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a3044e0ae65c099d76bf04536e223e70d89971688627c342252951f6c65f49d1
+67897ca97d8c98e119a498a3adb39548a579e12ee477e9dd74e9564a6f5e4c2b
diff --git a/src/test1.c b/src/test1.c
index a246baafa1..88bfdc06d2 100644
--- a/src/test1.c
+++ b/src/test1.c
@@ -2335,13 +2335,13 @@ static int SQLITE_TCLAPI test_stmt_scanstatus(
     };
 
     Tcl_Obj **aFlag = 0;
-    int nFlag = 0;
+    Tcl_Size nFlag = 0;
     int ii;
 
     if( Tcl_ListObjGetElements(interp, objv[2], &nFlag, &aFlag) ){
       return TCL_ERROR;
     }
-    for(ii=0; ii<nFlag; ii++){
+    for(ii=0; ii<(int)nFlag; ii++){
       int iVal = 0;
       int res = Tcl_GetIndexFromObjStruct(
           interp, aFlag[ii], aTbl, sizeof(aTbl[0]), "flag", 0, &iVal
@@ -6083,7 +6083,7 @@ static int SQLITE_TCLAPI fpnum_compare(
         break;
       }
     }
-    if( zA[i]=='e' && zB[i]=='e' ){
+    if( zA[i]=='e' && zB[j]=='e' ){
       i++;
       j++;
       if( (zA[i]=='+' || zA[i]=='-') && zB[j]==zA[i] ){  i++;  j++; }
@@ -8367,7 +8367,7 @@ static int SQLITE_TCLAPI test_user_authenticate(
 ){
   char *zUser = 0;
   char *zPasswd = 0;
-  int nPasswd = 0;
+  Tcl_Size nPasswd = 0;
   sqlite3 *db;
   int rc;
 
@@ -8380,7 +8380,7 @@ static int SQLITE_TCLAPI test_user_authenticate(
   }
   zUser = Tcl_GetString(objv[2]);
   zPasswd = Tcl_GetStringFromObj(objv[3], &nPasswd);
-  rc = sqlite3_user_authenticate(db, zUser, zPasswd, nPasswd);
+  rc = sqlite3_user_authenticate(db, zUser, zPasswd, (int)nPasswd);
   Tcl_SetResult(interp, (char *)t1ErrorName(rc), TCL_STATIC);
   return TCL_OK;
 }