database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-14 00:22:38 +03:00
Code Activity

Remove an unreachable branch from the unixMapfile() routine of the unix VFS.

Browse Source 
FossilOrigin-Name: b50f67bc46e65fe4e51667d48b4add58706a9443
This commit is contained in:
drh
2015-12-02 15:44:39 +00:00
parent f3b1ed0fc2
commit 333e6ca9a5
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Minor\ssimplifications\sto\sthe\sunix\sVFS. C Remove\san\sunreachable\sbranch\sfrom\sthe\sunixMapfile()\sroutine\sof\sthe\sunix\sVFS.
D 2015-12-02T13:11:03.174 D 2015-12-02T15:44:39.206
F Makefile.in 23d9a63484a383fc64951b25ef44067930f98dc6 F Makefile.in 23d9a63484a383fc64951b25ef44067930f98dc6
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc e8fdca1cb89a1b58b5f4d3a130ea9a3d28cb314d F Makefile.msc e8fdca1cb89a1b58b5f4d3a130ea9a3d28cb314d
@@ -323,7 +323,7 @@ F src/os.c 8fd25588eeba74068d41102d26810e216999b6c8
F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e
F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
F src/os_unix.c 2b65298be9db161beb0e3ffadc9be0080d51c320 F src/os_unix.c b2482c403890fc94ee6810a939c667911d871656
F src/os_win.c 386fba30419e8458b13209781c2af5590eab2811 F src/os_win.c 386fba30419e8458b13209781c2af5590eab2811
F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
F src/pager.c f92aacd5216d8815136c9e0190041783c602641a F src/pager.c f92aacd5216d8815136c9e0190041783c602641a
@@ -1408,7 +1408,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P f64ea8a052af9790d5e6987cbd5e81d77da6f172 P 2f13c16b45685ec6850cbd9da79e8198bad6a491
R 7335e7d7ad4ea5951ac863300cf3bdc9 R abab3e669867554a3d4200296f7779a0
U drh U drh
Z 5e48ed834d343e9f2a57065e0ab37833 Z cde83eb7aba3982fd2548e9f5c9718be

2
manifest.uuid
View File

@@ -1 +1 @@
2f13c16b45685ec6850cbd9da79e8198bad6a491 b50f67bc46e65fe4e51667d48b4add58706a9443

6
src/os_unix.c
View File

@@ -4768,6 +4768,7 @@ static void unixRemapfile(
*/ */
static int unixMapfile(unixFile *pFd, i64 nMap){ static int unixMapfile(unixFile *pFd, i64 nMap){
assert( nMap>=0 || pFd->nFetchOut==0 ); assert( nMap>=0 || pFd->nFetchOut==0 );
assert( nMap>0 || (pFd->mmapSize==0 && pFd->pMapRegion==0) );
if( pFd->nFetchOut>0 ) return SQLITE_OK; if( pFd->nFetchOut>0 ) return SQLITE_OK;
if( nMap<0 ){ if( nMap<0 ){
@@ -4781,12 +4782,9 @@ static int unixMapfile(unixFile *pFd, i64 nMap){
nMap = pFd->mmapSizeMax; nMap = pFd->mmapSizeMax;
} }
assert( nMap>0 || (pFd->mmapSize==0 && pFd->pMapRegion==0) );
if( nMap!=pFd->mmapSize ){ if( nMap!=pFd->mmapSize ){
if( nMap>0 ){
unixRemapfile(pFd, nMap); unixRemapfile(pFd, nMap);
}else{
unixUnmapfile(pFd);
}
} }
return SQLITE_OK; return SQLITE_OK;