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

in the current implementation. (CVS 6920)

FossilOrigin-Name: 1e510d7fc5cc47fe2714dbb1ed3ea7e90acbff7b

diff --git a/manifest b/manifest
index 83a98d169799f57e1e7531b07e1e1ae14b40070d..e4349fbdb42b0ea33ac37c9529ff7a0d2d82abae 100644 (file)
--- a/manifest
+++ b/manifest
@@ -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)
-D 2009-07-22T07:27:57
+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-22T13:19:20
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in df9359da7a726ccb67a45db905c5447d5c00c6ef
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -147,7 +147,7 @@ F src/os_common.h 8c61457df58f1a4bd5f5adc3e90e01b37bf7afbc
 F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5
 F src/os_unix.c cdb2a08b9ce4aa13b3f7b91d4dd60fb48be9f56a
 F src/os_win.c 725c38a524d168ce280446ad8761d731bc516405
-F src/pager.c b4edef365c4013e75ddce21c0a4ac046bfe1b969
+F src/pager.c c1b13280e111d33625b94a8391eb0c3c94a8384d
 F src/pager.h 5bd96ed838e4156e0effa5ffe746bce4c0112c24
 F src/parse.y bcd46d43fbd23a22b8c020a3eb1806b794794ed5
 F src/pcache.c 1dae135b70a029f81ed66f6e9b5d0db91480d5d0
@@ -741,7 +741,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P 38083228956ac05df45f44447ab39c64852239d2
-R 0cab1d6c65cf9787978529fe99839bb1
-U danielk1977
-Z d43492bf0989c2fd5cef71cedc911350
+P 7f3fc7f20f6dc205eedbe445e35f5071f1c01185
+R e3ef698fad4351a97409de00b6e0d6d6
+U drh
+Z 371d58c5e4ad95a5753bcee60ee41151

diff --git a/manifest.uuid b/manifest.uuid
index 6635184677489c2b2d0d907fc82440f27c6b96c4..a2d1b2f47a074552598c2eece0acdc3038041dc3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7f3fc7f20f6dc205eedbe445e35f5071f1c01185
\ No newline at end of file
+1e510d7fc5cc47fe2714dbb1ed3ea7e90acbff7b
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 03fc50fb4dff3174c2c992e34f3d1d4893713e9a..a0f5e6c09b54fa248c10bfd1a855954fa04e2526 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -18,7 +18,7 @@
 ** file simultaneously, or one process from reading the database while
 ** 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
 #include "sqliteInt.h"
@@ -2883,7 +2883,7 @@ static int pager_write_pagelist(PgHdr *pList){
   Pager *pPager;                       /* Pager object */
   int rc;                              /* Return code */
 
-  if( pList==0 ) return SQLITE_OK;
+  if( NEVER(pList==0) ) return SQLITE_OK;
   pPager = pList->pPager;
 
   /* At this point there may be either a RESERVED or EXCLUSIVE lock on the