From: drh <drh@noemail.net>
Date: Tue, 13 Dec 2016 20:30:29 +0000 (+0000)
Subject: Fix harmless compiler warnings.
X-Git-Tag: version-3.16.0~47
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=380c08eaadc26dc5e879266e3d536967297d2251;p=thirdparty%2Fsqlite.git

Fix harmless compiler warnings.

FossilOrigin-Name: ed2c9f3738c96d8e3dbece7ccb721cb1a8ae8fac
---

diff --git a/manifest b/manifest
index 6c25d39d50..254f17d042 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Convert\ssqlite3PagerGet()\sinto\sa\spointer-dispatched\svirtual\smethod.\s\sThis\nmakes\sit\sabout\s25%\sfaster.
-D 2016-12-13T18:47:54.625
+C Fix\sharmless\scompiler\swarnings.
+D 2016-12-13T20:30:29.436
 F Makefile.in 7639c6a09da11a9c7c6f2630fc981ee588d1072d
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -331,7 +331,7 @@ F src/auth.c 930b376a9c56998557367e6f7f8aaeac82a2a792
 F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
-F src/btree.c 0d377e5769657d3ac2a1b6ba081ba77a128610d5
+F src/btree.c b2055dff0b94e03eaad48a760984a2d8e39244e6
 F src/btree.h 2349a588abcd7e0c04f984e15c5c777b61637583
 F src/btreeInt.h 10c4b77c2fb399580babbcc7cf652ac10dba796e
 F src/build.c 178f16698cbcb43402c343a9413fe22c99ffee21
@@ -375,7 +375,7 @@ F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 F src/os_unix.c 30e2c43e4955db990e5b5a81e901f8aa74cc8820
 F src/os_win.c cf90abd4e50d9f56d2c20ce8e005aff55d7bd8e9
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
-F src/pager.c dbcac003871bf8a9bfb69d6cb66bbb85b528aaf6
+F src/pager.c c3ba8e69388d974017004aa3fd3511e5bbadbba0
 F src/pager.h d1e944291030351f362a0a7da9b5c3e34e603e39
 F src/parse.y 29153738a7322054359320eb00b5a4cd44389f20
 F src/pcache.c 51070ec9b8251bbf9c6ea3d35fd96a458752929e
@@ -1536,8 +1536,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 850877d1ea43104cc215353414b870c340acced2 dee20ba982125ea98c280ad1571789af0f393903
-R 1925a57b32b9d19fb42c95ae0d5863ee
-T +closed dee20ba982125ea98c280ad1571789af0f393903
+P 7f88bb44129a0cd36e27e00dc7c37e87cf3c90f7
+R f2e66ee6668f0716a35acfaa4809f04b
 U drh
-Z ca81384c708270e6307c733a622217dc
+Z 404271946c196a116af17aa555379b02
diff --git a/manifest.uuid b/manifest.uuid
index ad8184c8ed..99dfe7c001 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7f88bb44129a0cd36e27e00dc7c37e87cf3c90f7
\ No newline at end of file
+ed2c9f3738c96d8e3dbece7ccb721cb1a8ae8fac
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index e91fad3b12..0cd1a28778 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -1743,7 +1743,7 @@ static int btreeInitPage(MemPage *pPage){
   assert( pPage->aData == sqlite3PagerGetData(pPage->pDbPage) );
 
   if( !pPage->isInit ){
-    u32 pc;            /* Address of a freeblock within pPage->aData[] */
+    int pc;            /* Address of a freeblock within pPage->aData[] */
     u8 hdr;            /* Offset to beginning of page header */
     u8 *data;          /* Equal to pPage->aData */
     BtShared *pBt;        /* The main btree structure */
@@ -1844,7 +1844,7 @@ static int btreeInitPage(MemPage *pPage){
       if( next>0 ){
         return SQLITE_CORRUPT_BKPT;  /* Freeblock not in ascending order */
       }
-      if( pc+size>usableSize ){
+      if( pc+size>(unsigned int)usableSize ){
         return SQLITE_CORRUPT_BKPT;  /* Last freeblock extends past page end */
       }
     }
diff --git a/src/pager.c b/src/pager.c
index 7bafc1c09b..cd2ded4e3f 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -5472,11 +5472,6 @@ static int getPageMMap(
   PgHdr *pPg = 0;
   u32 iFrame = 0;                 /* Frame to read from WAL file */
 
-  assert( USEFETCH(pPager) );
-#ifdef SQLITE_HAS_CODEC
-  assert( pPager->xCodec==0 );
-#endif
-
   /* It is acceptable to use a read-only (mmap) page for any page except
   ** page 1 if there is no write-transaction open or the ACQUIRE_READONLY
   ** flag was specified by the caller. And so long as the db is not a 
@@ -5485,6 +5480,11 @@ static int getPageMMap(
    && (pPager->eState==PAGER_READER || (flags & PAGER_GET_READONLY))
   );
 
+  assert( USEFETCH(pPager) );
+#ifdef SQLITE_HAS_CODEC
+  assert( pPager->xCodec==0 );
+#endif
+
   /* Optimization note:  Adding the "pgno<=1" term before "pgno==0" here
   ** allows the compiler optimizer to reuse the results of the "pgno>1"
   ** test in the previous statement, and avoid testing pgno==0 in the
@@ -5540,6 +5540,8 @@ static int getPageError(
   DbPage **ppPage,    /* Write a pointer to the page here */
   int flags           /* PAGER_GET_XXX flags */
 ){
+  UNUSED_PARAMETER(pgno);
+  UNUSED_PARAMETER(flags);
   assert( pPager->errCode!=SQLITE_OK );
   *ppPage = 0;
   return pPager->errCode;