Fossil SCM
Cherry-pick [http://www.sqlite.org/src/info/1277932b7e8bb36c7070ffafbf110a8e128c267b|1277932b7e]: Fix a harmless compiler warning that crops up with SQLITE_MAX_MMAP_SIZE=0.
Commit
53aea235faf2cefca0729b5cf825260d2b9deaff
Parent
0484ccf2e9335e2…
1 file changed
+5
-1
+5
-1
| --- src/sqlite3.c | ||
| +++ src/sqlite3.c | ||
| @@ -8767,11 +8767,13 @@ | ||
| 8767 | 8767 | #define BTREE_SINGLE 4 /* The file contains at most 1 b-tree */ |
| 8768 | 8768 | #define BTREE_UNORDERED 8 /* Use of a hash implementation is OK */ |
| 8769 | 8769 | |
| 8770 | 8770 | SQLITE_PRIVATE int sqlite3BtreeClose(Btree*); |
| 8771 | 8771 | SQLITE_PRIVATE int sqlite3BtreeSetCacheSize(Btree*,int); |
| 8772 | -SQLITE_PRIVATE int sqlite3BtreeSetMmapLimit(Btree*,sqlite3_int64); | |
| 8772 | +#if SQLITE_MAX_MMAP_SIZE>0 | |
| 8773 | +SQLITE_PRIVATE int sqlite3BtreeSetMmapLimit(Btree*,sqlite3_int64); | |
| 8774 | +#endif | |
| 8773 | 8775 | SQLITE_PRIVATE int sqlite3BtreeSetPagerFlags(Btree*,unsigned); |
| 8774 | 8776 | SQLITE_PRIVATE int sqlite3BtreeSyncDisabled(Btree*); |
| 8775 | 8777 | SQLITE_PRIVATE int sqlite3BtreeSetPageSize(Btree *p, int nPagesize, int nReserve, int eFix); |
| 8776 | 8778 | SQLITE_PRIVATE int sqlite3BtreeGetPageSize(Btree*); |
| 8777 | 8779 | SQLITE_PRIVATE int sqlite3BtreeMaxPageCount(Btree*,int); |
| @@ -52977,10 +52979,11 @@ | ||
| 52977 | 52979 | sqlite3PagerSetCachesize(pBt->pPager, mxPage); |
| 52978 | 52980 | sqlite3BtreeLeave(p); |
| 52979 | 52981 | return SQLITE_OK; |
| 52980 | 52982 | } |
| 52981 | 52983 | |
| 52984 | +#if SQLITE_MAX_MMAP_SIZE>0 | |
| 52982 | 52985 | /* |
| 52983 | 52986 | ** Change the limit on the amount of the database file that may be |
| 52984 | 52987 | ** memory mapped. |
| 52985 | 52988 | */ |
| 52986 | 52989 | SQLITE_PRIVATE int sqlite3BtreeSetMmapLimit(Btree *p, sqlite3_int64 szMmap){ |
| @@ -52989,10 +52992,11 @@ | ||
| 52989 | 52992 | sqlite3BtreeEnter(p); |
| 52990 | 52993 | sqlite3PagerSetMmapLimit(pBt->pPager, szMmap); |
| 52991 | 52994 | sqlite3BtreeLeave(p); |
| 52992 | 52995 | return SQLITE_OK; |
| 52993 | 52996 | } |
| 52997 | +#endif /* SQLITE_MAX_MMAP_SIZE>0 */ | |
| 52994 | 52998 | |
| 52995 | 52999 | /* |
| 52996 | 53000 | ** Change the way data is synced to disk in order to increase or decrease |
| 52997 | 53001 | ** how well the database resists damage due to OS crashes and power |
| 52998 | 53002 | ** failures. Level 1 is the same as asynchronous (no syncs() occur and |
| 52999 | 53003 |
| --- src/sqlite3.c | |
| +++ src/sqlite3.c | |
| @@ -8767,11 +8767,13 @@ | |
| 8767 | #define BTREE_SINGLE 4 /* The file contains at most 1 b-tree */ |
| 8768 | #define BTREE_UNORDERED 8 /* Use of a hash implementation is OK */ |
| 8769 | |
| 8770 | SQLITE_PRIVATE int sqlite3BtreeClose(Btree*); |
| 8771 | SQLITE_PRIVATE int sqlite3BtreeSetCacheSize(Btree*,int); |
| 8772 | SQLITE_PRIVATE int sqlite3BtreeSetMmapLimit(Btree*,sqlite3_int64); |
| 8773 | SQLITE_PRIVATE int sqlite3BtreeSetPagerFlags(Btree*,unsigned); |
| 8774 | SQLITE_PRIVATE int sqlite3BtreeSyncDisabled(Btree*); |
| 8775 | SQLITE_PRIVATE int sqlite3BtreeSetPageSize(Btree *p, int nPagesize, int nReserve, int eFix); |
| 8776 | SQLITE_PRIVATE int sqlite3BtreeGetPageSize(Btree*); |
| 8777 | SQLITE_PRIVATE int sqlite3BtreeMaxPageCount(Btree*,int); |
| @@ -52977,10 +52979,11 @@ | |
| 52977 | sqlite3PagerSetCachesize(pBt->pPager, mxPage); |
| 52978 | sqlite3BtreeLeave(p); |
| 52979 | return SQLITE_OK; |
| 52980 | } |
| 52981 | |
| 52982 | /* |
| 52983 | ** Change the limit on the amount of the database file that may be |
| 52984 | ** memory mapped. |
| 52985 | */ |
| 52986 | SQLITE_PRIVATE int sqlite3BtreeSetMmapLimit(Btree *p, sqlite3_int64 szMmap){ |
| @@ -52989,10 +52992,11 @@ | |
| 52989 | sqlite3BtreeEnter(p); |
| 52990 | sqlite3PagerSetMmapLimit(pBt->pPager, szMmap); |
| 52991 | sqlite3BtreeLeave(p); |
| 52992 | return SQLITE_OK; |
| 52993 | } |
| 52994 | |
| 52995 | /* |
| 52996 | ** Change the way data is synced to disk in order to increase or decrease |
| 52997 | ** how well the database resists damage due to OS crashes and power |
| 52998 | ** failures. Level 1 is the same as asynchronous (no syncs() occur and |
| 52999 |
| --- src/sqlite3.c | |
| +++ src/sqlite3.c | |
| @@ -8767,11 +8767,13 @@ | |
| 8767 | #define BTREE_SINGLE 4 /* The file contains at most 1 b-tree */ |
| 8768 | #define BTREE_UNORDERED 8 /* Use of a hash implementation is OK */ |
| 8769 | |
| 8770 | SQLITE_PRIVATE int sqlite3BtreeClose(Btree*); |
| 8771 | SQLITE_PRIVATE int sqlite3BtreeSetCacheSize(Btree*,int); |
| 8772 | #if SQLITE_MAX_MMAP_SIZE>0 |
| 8773 | SQLITE_PRIVATE int sqlite3BtreeSetMmapLimit(Btree*,sqlite3_int64); |
| 8774 | #endif |
| 8775 | SQLITE_PRIVATE int sqlite3BtreeSetPagerFlags(Btree*,unsigned); |
| 8776 | SQLITE_PRIVATE int sqlite3BtreeSyncDisabled(Btree*); |
| 8777 | SQLITE_PRIVATE int sqlite3BtreeSetPageSize(Btree *p, int nPagesize, int nReserve, int eFix); |
| 8778 | SQLITE_PRIVATE int sqlite3BtreeGetPageSize(Btree*); |
| 8779 | SQLITE_PRIVATE int sqlite3BtreeMaxPageCount(Btree*,int); |
| @@ -52977,10 +52979,11 @@ | |
| 52979 | sqlite3PagerSetCachesize(pBt->pPager, mxPage); |
| 52980 | sqlite3BtreeLeave(p); |
| 52981 | return SQLITE_OK; |
| 52982 | } |
| 52983 | |
| 52984 | #if SQLITE_MAX_MMAP_SIZE>0 |
| 52985 | /* |
| 52986 | ** Change the limit on the amount of the database file that may be |
| 52987 | ** memory mapped. |
| 52988 | */ |
| 52989 | SQLITE_PRIVATE int sqlite3BtreeSetMmapLimit(Btree *p, sqlite3_int64 szMmap){ |
| @@ -52989,10 +52992,11 @@ | |
| 52992 | sqlite3BtreeEnter(p); |
| 52993 | sqlite3PagerSetMmapLimit(pBt->pPager, szMmap); |
| 52994 | sqlite3BtreeLeave(p); |
| 52995 | return SQLITE_OK; |
| 52996 | } |
| 52997 | #endif /* SQLITE_MAX_MMAP_SIZE>0 */ |
| 52998 | |
| 52999 | /* |
| 53000 | ** Change the way data is synced to disk in order to increase or decrease |
| 53001 | ** how well the database resists damage due to OS crashes and power |
| 53002 | ** failures. Level 1 is the same as asynchronous (no syncs() occur and |
| 53003 |