]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Fix harmless compiler warnings in FTS5.
authordrh <>
Mon, 9 Sep 2024 15:12:21 +0000 (15:12 +0000)
committerdrh <>
Mon, 9 Sep 2024 15:12:21 +0000 (15:12 +0000)
FossilOrigin-Name: aa75e701de61fe63ec15c35d70e53e950ff73b0dcb0d871dd8721412f3af297a

ext/fts5/fts5_main.c
manifest
manifest.uuid

index cb68c1444f60d8c45499e1f4e795e866f33d90e7..0cc6fd30a99ae42fbf4cc69cede53e0b717be95e 100644 (file)
@@ -1284,7 +1284,7 @@ void sqlite3Fts5ClearLocale(Fts5Config *pConfig){
 int sqlite3Fts5IsLocaleValue(Fts5Config *pConfig, sqlite3_value *pVal){
   int ret = 0;
   if( sqlite3_value_type(pVal)==SQLITE_BLOB ){
-    if( sqlite3_value_bytes(pVal)>FTS5_LOCALE_HDR_SIZE
+    if( sqlite3_value_bytes(pVal)>(int)FTS5_LOCALE_HDR_SIZE
      && 0==memcmp(sqlite3_value_blob(pVal), FTS5_LOCALE_HDR(pConfig), 4)
     ){
       ret = 1;
@@ -3011,7 +3011,7 @@ static void fts5ExtractValueFromColumn(
     int ii;
 
     if( pConfig->eContent==FTS5_CONTENT_EXTERNAL ){
-      if( nBlob<FTS5_LOCALE_HDR_SIZE 
+      if( nBlob<(int)FTS5_LOCALE_HDR_SIZE 
        || memcmp(pBlob, FTS5_LOCALE_HDR(pConfig), FTS5_LOCALE_HDR_SIZE) 
       ){
         sqlite3_result_error_code(pCtx, SQLITE_ERROR);
index 037c1b19a0dc96205adbf38777c2194f2a3ea826..6adf2943d1db597d2f7e22495b8143fc9b0856a3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\sfts5\slocale=1\stables\sand\sUPDATE\sstatements\sthat\smay\saffect\smore\sthan\sone\srow.
-D 2024-09-07T16:22:22.943
+C Fix\sharmless\scompiler\swarnings\sin\sFTS5.
+D 2024-09-09T15:12:21.524
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -100,7 +100,7 @@ F ext/fts5/fts5_config.c 353d2a0d12678cae6ab5b9ce54aed8dac0825667b69248b5a4ed81c
 F ext/fts5/fts5_expr.c 9a56f53700d1860f0ee2f373c2b9074eaf2a7aa0637d0e27a6476de26a3fee33
 F ext/fts5/fts5_hash.c adda4272be401566a6e0ba1acbe70ee5cb97fce944bc2e04dc707152a0ec91b1
 F ext/fts5/fts5_index.c 571483823193f09439356741669aa8c81da838ae6f5e1bfa7517f7ee2fb3addd
-F ext/fts5/fts5_main.c c9c5fcce73ad05ef6abc4f69b9ade54093b2a6cb8ceb3ef647bd2e0d5f93b628
+F ext/fts5/fts5_main.c c75bf3452858bca85c7e31dbedaefe7435d212c6e47f40725b3dce29366f0eee
 F ext/fts5/fts5_storage.c 42cde97eb7d8506a8d2c7ea80b292fc3017b1f5469e1acb0035a69c345e6cf71
 F ext/fts5/fts5_tcl.c 4db9258a7882c5eac0da4433042132aaf15b87dd1e1636c7a6ca203abd2c8bfe
 F ext/fts5/fts5_test_mi.c 08c11ec968148d4cb4119d96d819f8c1f329812c568bac3684f5464be177d3ee
@@ -2212,8 +2212,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 6206b90a4ec3f05e3bbb4844e71569bbde7df237550569e6419ff7c3146505dc
-R a6acb083cae329c41bdac6bb67941a5b
-U dan
-Z 2566687c7d077d4a754f89b771fd38fa
+P 70e42f941c0778a04b82655409c7caf4c1039589f7e43a8ec1e736ea8f931b26
+R 69a344fb56fcce855b538796f02d3cc2
+U drh
+Z 3b9693691a7ff11217f41ab494c023d1
 # Remove this line to create a well-formed Fossil manifest.
index 73e0954b370c36bcb1c03d65917c4dfc079c88c0..2d24292507c9dfc41b66142924a183fbe5159163 100644 (file)
@@ -1 +1 @@
-70e42f941c0778a04b82655409c7caf4c1039589f7e43a8ec1e736ea8f931b26
+aa75e701de61fe63ec15c35d70e53e950ff73b0dcb0d871dd8721412f3af297a