From: drh <> Date: Wed, 22 Sep 2021 14:43:35 +0000 (+0000) Subject: Fix harmless compiler warnings. X-Git-Tag: version-3.37.0~205 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd31c033c602bc75d04c8b6470684d0506861d6b;p=thirdparty%2Fsqlite.git Fix harmless compiler warnings. FossilOrigin-Name: d678ecca02698753d1b33e072566112e94ea36d0d3a8f4a24d2b09d131968d88 --- diff --git a/ext/expert/sqlite3expert.c b/ext/expert/sqlite3expert.c index a59e8a1e6f..a20c4f4e4d 100644 --- a/ext/expert/sqlite3expert.c +++ b/ext/expert/sqlite3expert.c @@ -920,6 +920,7 @@ static int idxFindCompatible( */ static int countNonzeros(void* pCount, int nc, char* azResults[], char* azColumns[]){ + (void)azColumns; /* Suppress unused parameter warning */ if( nc>0 && (azResults[0][0]!='0' || azResults[0][1]!=0) ){ *((int *)pCount) += 1; } diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c index e35bcf0807..0291704f4a 100644 --- a/ext/fts5/fts5_index.c +++ b/ext/fts5/fts5_index.c @@ -855,7 +855,7 @@ static void fts5StructureMakeWritable(int *pRc, Fts5Structure **pp){ for(i=0; inLevel; i++) pNew->aLevel[i].aSeg = 0; for(i=0; inLevel; i++){ Fts5StructureLevel *pLvl = &pNew->aLevel[i]; - int nByte = sizeof(Fts5StructureSegment) * pNew->aLevel[i].nSeg; + nByte = sizeof(Fts5StructureSegment) * pNew->aLevel[i].nSeg; pLvl->aSeg = (Fts5StructureSegment*)sqlite3Fts5MallocZero(pRc, nByte); if( pLvl->aSeg==0 ){ for(i=0; inLevel; i++){ diff --git a/manifest b/manifest index fd29271867..f515e7d9c4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C For\sshell.c.in,\sdefine\sCHAR_BITS\sto\s8\son\splatforms\sthat\sdo\snot\shave\sthat\nvalue\sset\sby\sdefault.\s\sThis\sfixes\sthe\sbuild\son\solder\smachines. -D 2021-09-22T14:26:22.004 +C Fix\sharmless\scompiler\swarnings. +D 2021-09-22T14:43:35.940 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -51,7 +51,7 @@ F ext/async/sqlite3async.h 46b47c79357b97ad85d20d2795942c0020dc20c532114a4980828 F ext/expert/README.md b321c2762bb93c18ea102d5a5f7753a4b8bac646cb392b3b437f633caf2020c3 F ext/expert/expert.c d548d603a4cc9e61f446cc179c120c6713511c413f82a4a32b1e1e69d3f086a4 F ext/expert/expert1.test 3c642a4e7bbb14f21ddab595436fb465a4733f47a0fe5b2855e1d5ff900ef08e -F ext/expert/sqlite3expert.c 73a57faa14d7d627aae18bfc8dfcdcadc9dc48c6133777f61bebbf8b9bdbab39 +F ext/expert/sqlite3expert.c bee71c524ab33441f0eae46b39691b9d348d1960d9274e834520ea6c573b542e F ext/expert/sqlite3expert.h ca81efc2679a92373a13a3e76a6138d0310e32be53d6c3bfaedabd158ea8969b F ext/expert/test_expert.c d56c194b769bdc90cf829a14c9ecbc1edca9c850b837a4d0b13be14095c32a72 F ext/fts1/README.txt 20ac73b006a70bcfd80069bdaf59214b6cf1db5e @@ -119,7 +119,7 @@ F ext/fts5/fts5_buffer.c 89a51b37c4aa1c02c1ec24c18c55196c0693b29a752fedfd036938d F ext/fts5/fts5_config.c 8336d0ff6db0933f63cfec8ae0ab76e68393259cbccc0b46e1f79f7fa1842ff3 F ext/fts5/fts5_expr.c 6ea447b0cb1888110087a8c04133817b0ccf964fe22414371b0e32189a556533 F ext/fts5/fts5_hash.c 1aa93c9b5f461afba66701ee226297dc78402b3bdde81e90a10de5fe3df14959 -F ext/fts5/fts5_index.c 742ba7ecfbd2dc24fe1204fc9c8ed0b77b05d5c29d120f1f00dac44beb788d75 +F ext/fts5/fts5_index.c 3cdcb62ef0ead4420cd9a5da32d6586e628a4da7adba9fffbfa54626b63ff77c F ext/fts5/fts5_main.c 35ebbcae681a4a40027c47bc2e94d7e7c81e331dc406bb9b23c546454ee8f98a F ext/fts5/fts5_storage.c 58ba71e6cd3d43a5735815e7956ee167babb4d2cbfe206905174792af4d09d75 F ext/fts5/fts5_tcl.c b1445cbe69908c411df8084a10b2485500ac70a9c747cdc8cda175a3da59d8ae @@ -1925,7 +1925,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 56da0e9c0321d1fd3c360722cd6284296f9ba459f6b37ab35c81ecabd18f12e3 -R e64df9dd7f9e5649303080820ff5d5a9 +P 96610cc8251ad4ff8d7f0536f20f4572a996bfa8d24bec8a7925a333e507da1e +R a3b2cf34f41419b8f768542a1a595879 U drh -Z ab5406251dac07f6df54e51480f60af8 +Z 540cae9edc2d1282d2484d063df2a30d diff --git a/manifest.uuid b/manifest.uuid index 7069dc8649..aa790fcd11 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -96610cc8251ad4ff8d7f0536f20f4572a996bfa8d24bec8a7925a333e507da1e \ No newline at end of file +d678ecca02698753d1b33e072566112e94ea36d0d3a8f4a24d2b09d131968d88 \ No newline at end of file