Additional compiler warnings suppressed. (CVS 3111)

FossilOrigin-Name: a359b1817e85a9c5f31085817ae70e3e0b8ac7a7

diff --git a/manifest b/manifest
index 9ebbcd54097726de433ab85f604c5407f1b96cfa..4cce4fc9c845cc60b5020219422739d5ad13a63a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sunused\sparameters\son\sinternal\sAPIs.\s\sSuppress\swarnings\sfrom\nCodeWarrior.\s(CVS\s3110)
-D 2006-02-24T02:53:50
+C Additional\scompiler\swarnings\ssuppressed.\s(CVS\s3111)
+D 2006-02-24T03:09:37
 F Makefile.in 5d8dff443383918b700e495de42ec65bc1c8865b
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -59,7 +59,7 @@ F src/os_unix.c 757a7b726764367f7b0595c4302969582c04413d
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
 F src/os_win.c c67a2c46d929cf54c8f80ec5e6079cf684a141a9
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
-F src/pager.c bb2c0007f6e447a4cf7b101e165fc0b79938785f
+F src/pager.c f65d0b05182ff6059e9566b2eed1ec5f0cddc2f6
 F src/pager.h 425a9e52d5404158de016799715cbc2c3d685178
 F src/parse.y 52b8cdcceeaef01283138de5541dcadd2eeff486
 F src/pragma.c 607b0f3b1916aa01918acd08499bd6ef21065c23
@@ -93,7 +93,7 @@ F src/vdbe.c 5fb9d3e64ed18f82e71bd2ff94c3e5f07384c7d4
 F src/vdbe.h 80ba1c391ec28180dd07a630577f50b22c2062da
 F src/vdbeInt.h 2109be6b58e3bfcd8e5b56d3b212b1a105a61051
 F src/vdbeapi.c 7dc662e7c905ce666bb506dced932e0307115cbf
-F src/vdbeaux.c 433850854059f1ff74ed09bc4df890fbae57f332
+F src/vdbeaux.c 8d5726935c2e3c3a1c8b17caaaa5a03a470de6ff
 F src/vdbefifo.c 9efb94c8c3f4c979ebd0028219483f88e57584f5
 F src/vdbemem.c 5f0afe3b92bb2c037f8d5d697f7c151fa50783a3
 F src/where.c 39af47e7f48be8df8a14a5965a38326bccf8eeed
@@ -354,7 +354,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 5d2e7ea01989fc9ba2c79d192760bc29f8cab463
-R baa01ddef2a6621d707afa4441611757
+P 4b22e4b847f8d5c29830baea541194ef3a0c4811
+R f5b7d68013d18e5a50ef6de23343b733
 U drh
-Z d0c2d619e1ded91f63a55f7331a682a5
+Z 50c68272d78d2691ee80674d514a25a2

diff --git a/manifest.uuid b/manifest.uuid
index 50f7fb3853636a0367c5193a388b4240f8a6df5c..4af09287ab854b3369edc04e717751beceec4aff 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4b22e4b847f8d5c29830baea541194ef3a0c4811
\ No newline at end of file
+a359b1817e85a9c5f31085817ae70e3e0b8ac7a7
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index e09a0c6a2488ac9a3cd171ba46735e76bd5558fc..d6a6518067067caf187f452c24e162af1d76c45d 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.259 2006/02/24 02:53:50 drh Exp $
+** @(#) $Id: pager.c,v 1.260 2006/02/24 03:09:37 drh Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -1328,13 +1328,8 @@ static int pager_playback(Pager *pPager){
       }
     }
   }
-
-  /* Pages that have been written to the journal but never synced
-  ** where not restored by the loop above.  We have to restore those
-  ** pages by reading them back from the original database.
-  */
-  assert( rc==SQLITE_OK );
-  pager_reload_cache(pPager);
+  /*NOTREACHED*/
+  assert( 0 );
 
 end_playback:
   if( rc==SQLITE_OK ){

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index b3f76244be9ba66f3765694fe8794daf3b3e500a..7f7bb90dfac05e29bebaad70fe9f5e73c3e383b4 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -202,11 +202,11 @@ static int opcodeNoPush(u8 op){
   ** IEEE floats.
   */ 
   static const u32 masks[5] = {
-    NOPUSH_MASK_0 + (NOPUSH_MASK_1<<16),
-    NOPUSH_MASK_2 + (NOPUSH_MASK_3<<16),
-    NOPUSH_MASK_4 + (NOPUSH_MASK_5<<16),
-    NOPUSH_MASK_6 + (NOPUSH_MASK_7<<16),
-    NOPUSH_MASK_8 + (NOPUSH_MASK_9<<16)
+    NOPUSH_MASK_0 + (((unsigned)NOPUSH_MASK_1)<<16),
+    NOPUSH_MASK_2 + (((unsigned)NOPUSH_MASK_3)<<16),
+    NOPUSH_MASK_4 + (((unsigned)NOPUSH_MASK_5)<<16),
+    NOPUSH_MASK_6 + (((unsigned)NOPUSH_MASK_7)<<16),
+    NOPUSH_MASK_8 + (((unsigned)NOPUSH_MASK_9)<<16)
   };
   assert( op<32*5 );
   return (masks[op>>5] & (1<<(op&0x1F)));