From: drh <drh@noemail.net>
Date: Wed, 16 Dec 2020 14:20:45 +0000 (+0000)
Subject: Remove an unnecessary and incorrect #ifdef.  Fix harmless compiler warnings.
X-Git-Tag: version-3.35.0~178
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5baf5c28351cfaa8daa605e7f066894eac9eef6;p=thirdparty%2Fsqlite.git

Remove an unnecessary and incorrect #ifdef.  Fix harmless compiler warnings.

FossilOrigin-Name: 31cd1bbfa5b06723288d99d1cb423f88353bdef770b82e9103f71a796d66f660
---

diff --git a/manifest b/manifest
index fe92f0c21e..89395f093a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stypo\sin\sthe\ssqlite3_free_filename()\sdocumentation.
-D 2020-12-16T13:17:32.129
+C Remove\san\sunnecessary\sand\sincorrect\s#ifdef.\s\sFix\sharmless\scompiler\swarnings.
+D 2020-12-16T14:20:45.731
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -481,7 +481,7 @@ F src/auth.c a3d5bfdba83d25abed1013a8c7a5f204e2e29b0c25242a56bc02bb0c07bf1e06
 F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c b995dfb6a2d79e2be51ce65a6f54a52f2c327507c35f3f8558d0def711d59298
+F src/btree.c fae82794638b41f4fdd0e49d5196ceaa7848e6666dbbf412eb173c58c4fbf48c
 F src/btree.h 285f8377aa1353185a32bf455faafa9ff9a0d40d074d60509534d14990c7829e
 F src/btreeInt.h 7614cae30f95b6aed0c7cac7718276a55cfe2c77058cbfd8bef5b75329757331
 F src/build.c f6449d4e85e998e14d3f537e8ea898dca2fcb83c277db3e60945af9b9177db81
@@ -495,7 +495,7 @@ F src/delete.c 927cf8f900583e79aca8f1a321979e0a8f053babd9a690b44b38f79de2cc09fe
 F src/expr.c 0d196ed5a2ebf96be7e8df88add4fabfad0dce16c0fed81a4b8f6a26e259797f
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 83372403298e6a7dd989a47aaacdbaa5b4307b5199dbd56e07d4896066b3de72
-F src/func.c 04b33016df7f4dcda295f71c6c776e2f49bfe0d50b5c5118240dfcd307d4755d
+F src/func.c 2163afb2cfabb71768f9254b95dbab3b7d4cd94394f6cffb86704e0b7e6ccabe
 F src/global.c ed55af196a9b66e198aaeda3f5454c3aa7d7d050c6c938181fd044b70d180a81
 F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
 F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
@@ -545,7 +545,7 @@ F src/shell.c.in e9f674ee4ec6c345679e8a5b16c869c6c59eb1540dd98ac69e4736ecddce009
 F src/sqlite.h.in 5b7593bb0f3658e682a9fcd1cd8fcedf244ec45ca93d645055a53172f55eb783
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 61b38c073d5e1e96a3d45271b257aef27d0d13da2bea5347692ae579475cd95e
-F src/sqliteInt.h ef8b4b3992d9460c9676c4695416f4141d5c5db4d3d78f89d20662361d6e21f1
+F src/sqliteInt.h 6d8363d245354e360b5efa5f1dc4a7658f252dc80b1c9010264d64dfe77fdf1b
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -1891,7 +1891,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 4e2dd2a53364f1fed48b995fd5d2642472585f6da5e4735e9da193ba7ff45514
-R 3372ddf7c965d76aff4a452b717f27a6
+P 48301edc90fe5811df0394b106edce7726d0ea86ac562c9f4db511b812a76433
+R bc270d52af99cca590351162eea6886b
 U drh
-Z 51799b847b8818e6198c5e71c210a358
+Z 53bb33e2ab1210ebb52c38429ca9bfe7
diff --git a/manifest.uuid b/manifest.uuid
index 56b34a6d6e..1abcf7fc42 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-48301edc90fe5811df0394b106edce7726d0ea86ac562c9f4db511b812a76433
\ No newline at end of file
+31cd1bbfa5b06723288d99d1cb423f88353bdef770b82e9103f71a796d66f660
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 0f4b5aaa4d..9b8005037e 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -8965,7 +8965,7 @@ int sqlite3BtreeTransferRow(BtCursor *pDest, BtCursor *pSrc, i64 iKey){
   BtShared *pBt = pDest->pBt;
   u8 *aOut = pBt->pTmpSpace;    /* Pointer to next output buffer */
   const u8 *aIn;                /* Pointer to next input buffer */
-  int nIn;                      /* Size of input buffer aIn[] */
+  u32 nIn;                      /* Size of input buffer aIn[] */
   u32 nRem;                     /* Bytes of data still to copy */
 
   getCellInfo(pSrc);
@@ -8983,7 +8983,7 @@ int sqlite3BtreeTransferRow(BtCursor *pDest, BtCursor *pSrc, i64 iKey){
     Pgno ovflIn = 0;
     DbPage *pPageIn = 0;
     MemPage *pPageOut = 0;
-    int nOut;                     /* Size of output buffer aOut[] */
+    u32 nOut;                     /* Size of output buffer aOut[] */
 
     nOut = btreePayloadToLocal(pDest->pPage, pSrc->info.nPayload);
     pBt->nPreformatSize = nOut + (aOut - pBt->pTmpSpace);
diff --git a/src/func.c b/src/func.c
index a29088a68d..e91fc256cb 100644
--- a/src/func.c
+++ b/src/func.c
@@ -2084,6 +2084,7 @@ static void signFunc(
 ){
   int type0;
   double x;
+  UNUSED_PARAMETER(argc);
   assert( argc==1 );
   type0 = sqlite3_value_numeric_type(argv[0]);
   if( type0!=SQLITE_INTEGER && type0!=SQLITE_FLOAT ) return;
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index d91ba49d95..a0e05570e7 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -1014,11 +1014,9 @@ extern u32 sqlite3SelectTrace;
 /*
 ** Macros for "wheretrace"
 */
-#if !defined(SQLITE_AMAGAMATION)
-extern u32 sqlite3WhereTrace;
-#endif
 #if defined(SQLITE_DEBUG) \
     && (defined(SQLITE_TEST) || defined(SQLITE_ENABLE_WHERETRACE))
+extern u32 sqlite3WhereTrace;
 # define WHERETRACE(K,X)  if(sqlite3WhereTrace&(K)) sqlite3DebugPrintf X
 # define WHERETRACE_ENABLED 1
 #else