Fix harmless compiler warnings.

FossilOrigin-Name: 0a926994691ccb02ea4f0ba3c2e8f728871ae67d24c705fbc0f7af81f38d5f47

diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c
index 36ac22bfa73ca12d0b5b173ee63f7218f9817bac..42065aeacf51af1d81f5a823ff6aabdbe69c2090 100644 (file)
--- a/ext/fts5/fts5_index.c
+++ b/ext/fts5/fts5_index.c
@@ -4809,7 +4809,7 @@ static void fts5DoSecureDelete(
     for(iIdx=0, iKeyOff=0; iIdx<nIdx; iKey++){
       u32 iVal = 0;
       iIdx += fts5GetVarint32(&aIdx[iIdx], iVal);
-      if( (iKeyOff+iVal)>iStart ) break;
+      if( (iKeyOff+iVal)>(u32)iStart ) break;
       iKeyOff += iVal;
     }
 
@@ -4937,7 +4937,7 @@ static void fts5FlushSecureDelete(
   i64 iRowid
 ){
   const int f = FTS5INDEX_QUERY_SKIPHASH;
-  int nTerm = strlen(zTerm);
+  int nTerm = (int)strlen(zTerm);
   Fts5Iter *pIter = 0;            /* Used to find term instance */
 
   fts5MultiIterNew(p, pStruct, f, 0, (const u8*)zTerm, nTerm, -1, 0, &pIter);

diff --git a/ext/session/sqlite3session.c b/ext/session/sqlite3session.c
index 89cffac19937a7b61afa54ea691c038b644ae86a..c74c6b4578b03c117c055196250884f981ee22eb 100644 (file)
--- a/ext/session/sqlite3session.c
+++ b/ext/session/sqlite3session.c
@@ -1102,7 +1102,7 @@ static int sessionTableInfo(
   
     i = 0;
     if( bRowid ){
-      int nName = strlen(SESSIONS_ROWID);
+      size_t nName = strlen(SESSIONS_ROWID);
       memcpy(pAlloc, SESSIONS_ROWID, nName+1);
       azCol[i] = (char*)pAlloc;
       pAlloc += nName+1;

diff --git a/manifest b/manifest
index a64e6934997bf3d04ddf1c71e80e4c7097ffa315..42930021d09eedc0da4bf35fdd67f321a35761f7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssupport\sfor\sJSON5.
-D 2023-05-01T18:28:48.240
+C Fix\sharmless\scompiler\swarnings.
+D 2023-05-01T18:52:35.233
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -92,7 +92,7 @@ F ext/fts5/fts5_buffer.c 3001fbabb585d6de52947b44b455235072b741038391f830d6b7292
 F ext/fts5/fts5_config.c 46af0b3c3c3f00bfc5bdd307434d7c5f0fa0678a034dd48345cd83b20068efbd
 F ext/fts5/fts5_expr.c 7d298d76ea010c339b26ca47f6f69e9aef520ea46c083deaa4e83e87cf0e94b1
 F ext/fts5/fts5_hash.c d4fb70940359f2120ccd1de7ffe64cc3efe65de9e8995b822cd536ff64c96982
-F ext/fts5/fts5_index.c a84273c6dd091bca6f78444797e49da1b07fabb8eb41ae42add91bba9d1bbd02
+F ext/fts5/fts5_index.c a626b7838fbe38db8826dd5776c3e0d1fb9a9ce7b3411dbed7be5e39c39121a7
 F ext/fts5/fts5_main.c b4dba04a36aaf9b8e8cef0100b6dbb422cc74753eacc11d6401cac7a87c0f38d
 F ext/fts5/fts5_storage.c 76c6085239eb44424004c022e9da17a5ecd5aaec859fba90ad47d3b08f4c8082
 F ext/fts5/fts5_tcl.c b1445cbe69908c411df8084a10b2485500ac70a9c747cdc8cda175a3da59d8ae
@@ -472,7 +472,7 @@ F ext/session/sessionrowid.test 6323ba831721205fd729929745038fd54e9d128c66c654b8
 F ext/session/sessionsize.test 8fcf4685993c3dbaa46a24183940ab9f5aa9ed0d23e5fb63bfffbdb56134b795
 F ext/session/sessionstat1.test b039e38e2ba83767b464baf39b297cc0b1cc6f3292255cb467ea7e12d0d0280c
 F ext/session/sessionwor.test 6fd9a2256442cebde5b2284936ae9e0d54bde692d0f5fd009ecef8511f4cf3fc
-F ext/session/sqlite3session.c c30768077832f04f6ae98ab5a5347eae78b4f840bc958e16ae8aa970261a315e
+F ext/session/sqlite3session.c d14d3043d4e04b080090d92b46e7b01ed25f49985161c8cb4fba05eefaf85850
 F ext/session/sqlite3session.h 653e9d49c4edae231df8a4c8d69c2145195aedb32462d4b44229dbee7d2680fb
 F ext/session/test_session.c 5285482f83cd92b4c1fe12fcf88210566a18312f4f2aa110f6399dae46aeccbb
 F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
@@ -595,7 +595,7 @@ F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h b638809e083b601b618df877b2e89cb87c2a47a01f4def10be4c4ebb54664ac7
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c a8de1db43335fc4946370a7a7e47d89975ad678ddb15078a150e993ba2fb37d4
-F src/json.c dd76caa9c9f1b417f7d7cdee06baabcbfc4c5ee18a578150d8f19c28260abeac
+F src/json.c 77686019edebe229dfaabada4180b4dca6d3122ea82f981e178b77b7a9340a16
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c be5af440f3192c58681b5d43167dbca3ccbfce394d89faa22378a14264781136
 F src/main.c 09bc5191f75dc48fc4dfddda143cb864c0c3dbc3297eb9a9c8e01fea58ff847d
@@ -636,7 +636,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 3e53e02ce87c9582bd7e7d22f13f4094a271678d9dc72820fa257a2abb5e4032
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c f879cef11c462a2c37a8c906932781e384c3bb32042c355a704a043029c90d27
-F src/shell.c.in 09097e1b9df1f8092e85bf89979e12ca7b608d7efc84551b5d0c8de4dded7797
+F src/shell.c.in 3984d857a1a5d76eff261dfe8d7bef1f0e51e586af0215365301b5c0bd5ffec4
 F src/sqlite.h.in 6066996620c2a97193518148ab2d3cedf37d8ee7667dafa96c207a86152b2cfb
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
@@ -2068,9 +2068,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P ab75170d5609c477613466e8880f20b74b0069281db6536fe09db06ea9d7cff3 1b991c78141a9915ae9350ecb347a758e50d7d25c8a0f4cc098ae10d47c27043
-R d47f0442b266c4b31be73caa106551c0
-T +closed 1b991c78141a9915ae9350ecb347a758e50d7d25c8a0f4cc098ae10d47c27043
+P f8c3ed23a6931b1da3b93b3274b132387078112a5c8e8d06b5312c47987d3937
+R 403020ca8f01732564c548c59e1a6a0f
 U drh
-Z 86cda36754b86452b62afe6022ca194a
+Z 5b27a0031a8a680d5f1735b2f157795b
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 0d7ef6682424b52139f810772cea6ced4106aec2..fe62931d143987547d3aaf2b7bfb8329b3c3b240 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f8c3ed23a6931b1da3b93b3274b132387078112a5c8e8d06b5312c47987d3937
\ No newline at end of file
+0a926994691ccb02ea4f0ba3c2e8f728871ae67d24c705fbc0f7af81f38d5f47
\ No newline at end of file

diff --git a/src/json.c b/src/json.c
index aae48c291a50dddf14564f1c7fcd846f789ace5c..b7cd6cbdf2f9913e44f5ad38ec42e530a1d6bd9f 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -303,7 +303,7 @@ static void jsonAppendString(JsonString *p, const char *zIn, u32 N){
 ** features.
 */
 static void jsonAppendNormalizedString(JsonString *p, const char *zIn, u32 N){
-  int i;
+  u32 i;
   jsonAppendChar(p, '"');
   zIn++;
   N -= 2;
@@ -391,7 +391,7 @@ static void jsonAppendNormalizedInt(JsonString *p, const char *zIn, u32 N){
 ** features.
 */
 static void jsonAppendNormalizedReal(JsonString *p, const char *zIn, u32 N){
-  int i;
+  u32 i;
   if( zIn[0]=='+' ){
     zIn++;
     N--;
@@ -2608,7 +2608,7 @@ static void jsonErrorFunc(
     sqlite3_result_int(ctx, 0);
   }else{
     int n = 1;
-    int i;
+    u32 i;
     const char *z = p->zJson;
     for(i=0; i<p->iErr && ALWAYS(z[i]); i++){
       if( (z[i]&0xc0)!=0x80 ) n++;

diff --git a/src/shell.c.in b/src/shell.c.in
index 7285067bef50ff7511f36445bee2501b6af403c1..36f7b38cb8b07ef1a20607275b87839729505ba8 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -5757,7 +5757,7 @@ static int sql_trace_callback(
       break;
     }
     case SQLITE_TRACE_PROFILE: {
-      sqlite3_int64 nNanosec = *(sqlite3_int64*)pX;
+      sqlite3_int64 nNanosec = pX ? *(sqlite3_int64*)pX : 0;
       utf8_printf(p->traceOut, "%.*s; -- %lld ns\n", (int)nSql, zSql, nNanosec);
       break;
     }