mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compiler warnings.

Browse Source 
FossilOrigin-Name: 44c760d150b494ddd88382360cfcc4734fec936ed620f88b9df33ea7215c2fc2
This commit is contained in:
drh 2017-07-20 19:08:35 +00:00
parent 1af0a4e1df
commit 0a2afca904
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifest
View File

@ -1,5 +1,5 @@
C Fix\sa\sfaulty\s#ifdef\son\sthe\sprevious\scheck-in
D 2017-07-20T18:56:21.537
C Fix\scompiler\swarnings.
D 2017-07-20T19:08:35.935
F Makefile.in d9873c9925917cca9990ee24be17eb9613a668012c85a343aef7e5536ae266e8
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc 02b469e9dcd5b7ee63fc1fb05babc174260ee4cfa4e0ef2e48c3c6801567a016
@ -399,7 +399,7 @@ F src/auth.c 79f96c6f33bf0e5da8d1c282cee5ebb1852bb8a6ccca3e485d7c459b035d9c3c
F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
F src/bitvec.c c77b7f5759e413c1c8b53267d633c952e66db79c1171964c7e24c0f92f5019cf
F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
F src/btree.c 7e9673478702a5b26ebbbfc1e55a1f0b60bc147a52742db86f781e9fe96c6ecc
F src/btree.c a21ffc82236d6108633559c9459d67b0e173e82934d417ad2ae998511ede6b55
F src/btree.h e8045998d865a21de226a417467cc64cf9d66e41b91b7436539f99ee464b5402
F src/btreeInt.h 4a4cc19595e98c471c05cd9d7fc824da3397c303c7293019f4df7706caacf2fe
F src/build.c 62faff0876fdce2b18f14312e3e891f3f366ee493c8fb48d844f9cbae15e6a02
@ -443,7 +443,7 @@ F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
F src/os_unix.c 30e2c43e4955db990e5b5a81e901f8aa74cc8820
F src/os_win.c 2a6c73eef01c51a048cc4ddccd57f981afbec18a
F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
F src/pager.c 7666599a49ff5098cfaea232cae118ad9afda37a96c9afa8f6db656a977c9cb6
F src/pager.c f29bab45ff5a2c51083196f4bb72d6ad1ab9d1811368f97e52b50579b6e19677
F src/pager.h 403b7d242616f8742ec149ede4a06b3e66896c554ce09c2abeddb926fdd1b707
F src/parse.y e4dbcc6136fc4f3084cedd41036401eafd336c5f7cb33bc516fed913a46cac2a
F src/pcache.c 62835bed959e2914edd26afadfecce29ece0e870
@ -535,7 +535,7 @@ F src/vdbesort.c f512c68d0bf7e0105316a5594c4329358c8ee9cae3b25138df041d97516c037
F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
F src/vtab.c 35b9bdc2b41de32a417141d12097bcc4e29a77ed7cdb8f836d1d2305d946b61b
F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
F src/wal.c e006353c3578071a457888aedd5eec9c8f1ba31ba11ddac4084c91c80478ca16
F src/wal.c 57c8c0720420b5b4a4301b263f3cb09f68cf4cd2240f4473de0910b91de03923
F src/wal.h 1ea51dc499d6451529b822a8aaac053eafeef10b7fd9e5a4c9cc413182be429f
F src/walker.c a7ca64ce08a83a20d32186fbe06bca9234e348cfcf07959ee322fdc3e8a6173a
F src/where.c cbe8ddffbcec7ce86f7a800fe8fd10aee412c76c87e0dd3732a1682e68d74cd9
@ -1648,7 +1648,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 a29401e924e6f82ca1c3eec98c6c0b2f1d5b9d7fba9af41a78516f21a7bab3a2
R 266b56d38ac33675de86b579a395b93a
P 7355e74239fc20f3d948867902675069e6a4efd103bf734f1b24a132f6d2edd1
R 9b106d6151f13525ebfd4ea2a990e095
U drh
Z 6866fd6a6d6e7ac87e940c57657cce02
Z 89e2d0fc2610ca8ab68df1aaa870de84

2
manifest.uuid
View File

@ -1 +1 @@
7355e74239fc20f3d948867902675069e6a4efd103bf734f1b24a132f6d2edd1
44c760d150b494ddd88382360cfcc4734fec936ed620f88b9df33ea7215c2fc2

1
src/btree.c
View File

@ -4076,7 +4076,6 @@ static int btreeRelocateRange(
rc = allocateBtreePage(pBt, &pFree, &iNew, iFirst-1, BTALLOC_LE);
assert( rc!=SQLITE_OK || iNew<iFirst );
if( rc==SQLITE_OK ){
MemPage *pPg = 0;
releasePage(pFree);
btreeGetPage(pBt, iPg, &pPg, 0);
rc = relocatePage(pBt, pPg, pEntry->eType, pEntry->parent,iNew,1);

1
src/pager.c
View File

@ -5474,6 +5474,7 @@ static int getPageNormal(
/* If this is an CONCURRENT transaction and the page being read was
** present in the database file when the transaction was opened,
** mark it as read in the pAllRead vector. */
pPg = 0;
if( pPager->pAllRead && pgno<=pPager->dbOrigSize ){
rc = sqlite3BitvecSet(pPager->pAllRead, pgno);
if( rc!=SQLITE_OK ) goto pager_acquire_err;

7
src/wal.c
View File

@ -2899,9 +2899,10 @@ int sqlite3WalLockForCommit(
rc = walHashGet(pWal, iHash, &aHash, &aPgno, &iZero);
if( rc==SQLITE_OK ){
int i;
int iMin = (iFirst - iZero);
int iMax = (iHash==0) ? HASHTABLE_NPAGE_ONE : HASHTABLE_NPAGE;
u32 i, iMin, iMax;
assert( iFirst >= iZero );
iMin = (iFirst - iZero);
iMax = (iHash==0) ? HASHTABLE_NPAGE_ONE : HASHTABLE_NPAGE;
if( iMin<1 ) iMin = 1;
if( iMax>head.mxFrame ) iMax = head.mxFrame;
for(i=iMin; rc==SQLITE_OK && i<=iMax; i++){