database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00
Code Activity

Do not embedded #if inside an assert() statement.

Browse Source 
Fix for check-in [dca8763872a]

FossilOrigin-Name: d7d4a94fc1209fd32d7c8e20ac83eb169b81ee25
This commit is contained in:
drh
2010-10-05 18:22:47 +00:00
parent 96b958afae
commit f7f55edb68
3 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
manifest
View File

@@ -1,5 +1,8 @@
C Have\sthe\spager\schange\sto\sat\sleast\sWRITER_CACHEMOD\sstate\sbefore\smarking\sany\spages\sas\sdirty\s(instead\sof\simmediately\safter).\sOtherwise,\sif\san\serror\soccurs,\sthe\spager\smay\sbe\sleft\sin\sWRITER_LOCKED\sstate\swith\sdirty\spages\sin\sthe\scache. -----BEGIN PGP SIGNED MESSAGE-----
D 2010-10-05T17:02:48 Hash: SHA1
C Do\snot\sembedded\s#if\sinside\san\sassert()\sstatement.\nFix\sfor\scheck-in\s[dca8763872a]
D 2010-10-05T18:22:48
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -159,7 +162,7 @@ F src/os.c 22ac61d06e72a0dac900400147333b07b13d8e1d
F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9 F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
F src/os_os2.c 72d0b2e562952a2464308c4ce5f7913ac10bef3e F src/os_os2.c 72d0b2e562952a2464308c4ce5f7913ac10bef3e
F src/os_unix.c ae27ac760ad9c79f0fa3c96bfb31975c45aa704d F src/os_unix.c 00a4a84aba46b61439913bebf0c10d408e42a630
F src/os_win.c 2f90f7bdec714fad51cd31b4ecad3cc1b4bb5aad F src/os_win.c 2f90f7bdec714fad51cd31b4ecad3cc1b4bb5aad
F src/pager.c 6c6dde871c540438862d5169650544d843e5b7f7 F src/pager.c 6c6dde871c540438862d5169650544d843e5b7f7
F src/pager.h 8167a1e720d0b7a2790079007128e594010220ad F src/pager.h 8167a1e720d0b7a2790079007128e594010220ad
@@ -872,7 +875,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P 04dcba6b3379d2168609950ed919c8f743705333 P 471a4efbb7e5e32b144b2e2128337a6af950b8f5
R bdadc2754b2c663c0809da21888af26a R 433709481784cf8c0bddd1598c7f35a7
U dan U drh
Z 210a2f6d2e9b55ba1bed3a89142a775f Z f40360de42f6696b1934fc46d9581f6d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFMq2z8oxKgR168RlERApTxAKCFsrz56lS7fNVHPGbg4j3YEpHjlQCcDYLf
iKhqx4Kkj+iVGUocuwANMTs=
=o6C0
-----END PGP SIGNATURE-----

2
manifest.uuid
View File

@@ -1 +1 @@
471a4efbb7e5e32b144b2e2128337a6af950b8f5 d7d4a94fc1209fd32d7c8e20ac83eb169b81ee25

7
src/os_unix.c
View File

@@ -4081,11 +4081,12 @@ static int fillInUnixFile(
** exception is when opening the proxy "conch" file in builds that ** exception is when opening the proxy "conch" file in builds that
** include the special Apple locking styles. ** include the special Apple locking styles.
*/ */
assert( zFilename==0 || zFilename[0]=='/'
#if defined(__APPLE__) && SQLITE_ENABLE_LOCKING_STYLE #if defined(__APPLE__) && SQLITE_ENABLE_LOCKING_STYLE
|| pVfs->pAppData==(void*)&autolockIoFinder assert( zFilename==0 || zFilename[0]=='/'
|| pVfs->pAppData==(void*)&autolockIoFinder );
#else
assert( zFilename==0 || zFilename[0]=='/' );
#endif #endif
);
OSTRACE(("OPEN %-3d %s\n", h, zFilename)); OSTRACE(("OPEN %-3d %s\n", h, zFilename));
pNew->h = h; pNew->h = h;