database/sqlite
database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-04-26 11:28:58 +03:00
Code

Add a NEVER() macro around a pager.c conditional that must always be false

Browse Source 
in the current implementation. (CVS 6920)

FossilOrigin-Name: 1e510d7fc5cc47fe2714dbb1ed3ea7e90acbff7b
This commit is contained in:
drh 2009-07-22 13:19:20 +00:00
parent 257d9dc748
commit fe6212d549
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@ -1,5 +1,5 @@
C Changes\sto\stest\scode\s(only)\sto\sallow\sveryquick.test\sto\srun\swith\sOMIT_UTF16\sbuilsd.\sTicket\s#3985.\s(CVS\s6919) C Add\sa\sNEVER()\smacro\saround\sa\spager.c\sconditional\sthat\smust\salways\sbe\sfalse\nin\sthe\scurrent\simplementation.\s(CVS\s6920)
D 2009-07-22T07:27:57 D 2009-07-22T13:19:20
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in df9359da7a726ccb67a45db905c5447d5c00c6ef F Makefile.in df9359da7a726ccb67a45db905c5447d5c00c6ef
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@ -147,7 +147,7 @@ F src/os_common.h 8c61457df58f1a4bd5f5adc3e90e01b37bf7afbc
F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5 F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5
F src/os_unix.c cdb2a08b9ce4aa13b3f7b91d4dd60fb48be9f56a F src/os_unix.c cdb2a08b9ce4aa13b3f7b91d4dd60fb48be9f56a
F src/os_win.c 725c38a524d168ce280446ad8761d731bc516405 F src/os_win.c 725c38a524d168ce280446ad8761d731bc516405
F src/pager.c b4edef365c4013e75ddce21c0a4ac046bfe1b969 F src/pager.c c1b13280e111d33625b94a8391eb0c3c94a8384d
F src/pager.h 5bd96ed838e4156e0effa5ffe746bce4c0112c24 F src/pager.h 5bd96ed838e4156e0effa5ffe746bce4c0112c24
F src/parse.y bcd46d43fbd23a22b8c020a3eb1806b794794ed5 F src/parse.y bcd46d43fbd23a22b8c020a3eb1806b794794ed5
F src/pcache.c 1dae135b70a029f81ed66f6e9b5d0db91480d5d0 F src/pcache.c 1dae135b70a029f81ed66f6e9b5d0db91480d5d0
@ -741,7 +741,7 @@ 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 672f81d693a03f80f5ae60bfefacd8a349e76746 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
P 38083228956ac05df45f44447ab39c64852239d2 P 7f3fc7f20f6dc205eedbe445e35f5071f1c01185
R 0cab1d6c65cf9787978529fe99839bb1 R e3ef698fad4351a97409de00b6e0d6d6
U danielk1977 U drh
Z d43492bf0989c2fd5cef71cedc911350 Z 371d58c5e4ad95a5753bcee60ee41151

2
manifest.uuid
View File

@ -1 +1 @@
7f3fc7f20f6dc205eedbe445e35f5071f1c01185 1e510d7fc5cc47fe2714dbb1ed3ea7e90acbff7b

4
src/pager.c
View File

@ -18,7 +18,7 @@
** file simultaneously, or one process from reading the database while ** file simultaneously, or one process from reading the database while
** another is writing. ** another is writing.
** **
** @(#) $Id: pager.c,v 1.611 2009/07/22 02:02:40 drh Exp $ ** @(#) $Id: pager.c,v 1.612 2009/07/22 13:19:20 drh Exp $
*/ */
#ifndef SQLITE_OMIT_DISKIO #ifndef SQLITE_OMIT_DISKIO
#include "sqliteInt.h" #include "sqliteInt.h"
@ -2883,7 +2883,7 @@ static int pager_write_pagelist(PgHdr *pList){
Pager *pPager; /* Pager object */ Pager *pPager; /* Pager object */
int rc; /* Return code */ int rc; /* Return code */
if( pList==0 ) return SQLITE_OK; if( NEVER(pList==0) ) return SQLITE_OK;
pPager = pList->pPager; pPager = pList->pPager;
/* At this point there may be either a RESERVED or EXCLUSIVE lock on the /* At this point there may be either a RESERVED or EXCLUSIVE lock on the