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

Changes to os_win.c to have it return same error code as os_unix.c.

Browse Source 
FossilOrigin-Name: 33b6f069d8059903312282962181839ff983e5c4
This commit is contained in:
shaneh 2010-07-02 19:49:38 +00:00
parent cac29a67e9
commit fd28639f12
4 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
manifest
View File

@ -1,8 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
C Omit\sthe\sOP_JournalMode\sopcode\sfrom\sthe\sVDBE\swhen\sSQLITE_OMIT_PRAGMA\sis\ndefined.
D 2010-07-02T19:36:52
C Changes\sto\sos_win.c\sto\shave\sit\sreturn\ssame\serror\scode\sas\sos_unix.c.
D 2010-07-02T19:49:38
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@ -153,12 +150,12 @@ F src/mutex_os2.c 6a62583e374ba3ac1a3fcc0da2bfdac7d3942689
F src/mutex_unix.c cf84466b4fdd2baa0d5a10bb19f08b2abc1ce42e
F src/mutex_w32.c 1fe0e735897be20e09dd6f53c3fb516c6b48c0eb
F src/notify.c cbfa66a836da3a51567209636e6a94059c137930
F src/os.c 1b3a1edf20587639d9d88bfebe018f7a6e7ba0ec
F src/os.c c34882169b2f8ee0942c4f6aff9ee705e6110cdf
F src/os.h d7775504a51e6e0d40315aa427b3e229ff9ff9ca
F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
F src/os_os2.c 665876d5eec7585226b0a1cf5e18098de2b2da19
F src/os_unix.c d7910391a4c9fa6898f7c9abbbb821d5d7edb78f
F src/os_win.c e82ed9e1c1d5df0ece234fd3157c32d66bb2c83c
F src/os_win.c dd4c6f238fe464e01dab5e4bc9158187ae305fe8
F src/pager.c b75a7fa96ecc8bef91bb014499f77a8f5f705252
F src/pager.h 879fdde5a102d2f21a3135d6f647530b21c2796c
F src/parse.y ace5c7a125d9f2a410e431ee3209034105045f7e
@ -833,14 +830,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P 336ce7d29767f76c4a92aa4bbc46d21e19871667
R 217ab76abbb703b993ec9ef38809fa6c
U drh
Z a8fb4caae1487543fc1d1643b8a41cad
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFMLj/XoxKgR168RlERAk8+AJ41mSJneLVxQjYgDYTWKWWgv78ArgCfZ5F9
aiYNrBp4wk+L4UAUxFtyf7Q=
=S74b
-----END PGP SIGNATURE-----
P 565ff65c61c85c9b2122b31bd9792692aa1e9cda
R da14ba65ec280d46099ad324e3b311d2
U shaneh
Z 995cb31c85f10b4e6d92cd3197cabb46

2
manifest.uuid
View File

@ -1 +1 @@
565ff65c61c85c9b2122b31bd9792692aa1e9cda
33b6f069d8059903312282962181839ff983e5c4

2
src/os.c
View File

@ -34,7 +34,7 @@
** sqlite3OsLock()
**
*/
#if defined(SQLITE_TEST) && (SQLITE_OS_WIN==0)
#if defined(SQLITE_TEST)
int sqlite3_memdebug_vfs_oom_test = 1;
#define DO_OS_MALLOC_TEST(x) \
if (sqlite3_memdebug_vfs_oom_test && (!x || !sqlite3IsMemJournal(x))) { \

3
src/os_win.c
View File

@ -1431,6 +1431,9 @@ static int winShmOpen(
*/
if( winShmSystemLock(pShmNode, _SHM_WRLCK, WIN_SHM_DMS, 1)==SQLITE_OK ){
rc = winTruncate((sqlite3_file *)&pShmNode->hFile, 0);
if( rc!=SQLITE_OK ){
rc = SQLITE_IOERR_SHMOPEN;
}
}
if( rc==SQLITE_OK ){
winShmSystemLock(pShmNode, _SHM_UNLCK, WIN_SHM_DMS, 1);