/ Check-in [a359b181]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Additional compiler warnings suppressed. (CVS 3111)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:a359b1817e85a9c5f31085817ae70e3e0b8ac7a7
User & Date: drh 2006-02-24 03:09:37
Context
2006-02-27
21:58
Detect stack overflow in the parser and report an error. (CVS 3112) check-in: bd2c38f4 user: drh tags: trunk
2006-02-24
03:09
Additional compiler warnings suppressed. (CVS 3111) check-in: a359b181 user: drh tags: trunk
02:53
Remove unused parameters on internal APIs. Suppress warnings from CodeWarrior. (CVS 3110) check-in: 4b22e4b8 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/pager.c.

    14     14   ** The pager is used to access a database disk file.  It implements
    15     15   ** atomic commit and rollback through the use of a journal file that
    16     16   ** is separate from the database file.  The pager also implements file
    17     17   ** locking to prevent two processes from writing the same database
    18     18   ** file simultaneously, or one process from reading the database while
    19     19   ** another is writing.
    20     20   **
    21         -** @(#) $Id: pager.c,v 1.259 2006/02/24 02:53:50 drh Exp $
           21  +** @(#) $Id: pager.c,v 1.260 2006/02/24 03:09:37 drh Exp $
    22     22   */
    23     23   #ifndef SQLITE_OMIT_DISKIO
    24     24   #include "sqliteInt.h"
    25     25   #include "os.h"
    26     26   #include "pager.h"
    27     27   #include <assert.h>
    28     28   #include <string.h>
................................................................................
  1324   1324             break;
  1325   1325           }else{
  1326   1326             goto end_playback;
  1327   1327           }
  1328   1328         }
  1329   1329       }
  1330   1330     }
  1331         -
  1332         -  /* Pages that have been written to the journal but never synced
  1333         -  ** where not restored by the loop above.  We have to restore those
  1334         -  ** pages by reading them back from the original database.
  1335         -  */
  1336         -  assert( rc==SQLITE_OK );
  1337         -  pager_reload_cache(pPager);
         1331  +  /*NOTREACHED*/
         1332  +  assert( 0 );
  1338   1333   
  1339   1334   end_playback:
  1340   1335     if( rc==SQLITE_OK ){
  1341   1336       rc = pager_unwritelock(pPager);
  1342   1337     }
  1343   1338     if( zMaster ){
  1344   1339       /* If there was a master journal and this routine will return true,

Changes to src/vdbeaux.c.

   198    198     ** 16-bit bitmasks (rather than 32-bit) are specified in opcodes.h 
   199    199     ** because the file is generated by an awk program. Awk manipulates
   200    200     ** all numbers as floating-point and we don't want to risk a rounding
   201    201     ** error if someone builds with an awk that uses (for example) 32-bit 
   202    202     ** IEEE floats.
   203    203     */ 
   204    204     static const u32 masks[5] = {
   205         -    NOPUSH_MASK_0 + (NOPUSH_MASK_1<<16),
   206         -    NOPUSH_MASK_2 + (NOPUSH_MASK_3<<16),
   207         -    NOPUSH_MASK_4 + (NOPUSH_MASK_5<<16),
   208         -    NOPUSH_MASK_6 + (NOPUSH_MASK_7<<16),
   209         -    NOPUSH_MASK_8 + (NOPUSH_MASK_9<<16)
          205  +    NOPUSH_MASK_0 + (((unsigned)NOPUSH_MASK_1)<<16),
          206  +    NOPUSH_MASK_2 + (((unsigned)NOPUSH_MASK_3)<<16),
          207  +    NOPUSH_MASK_4 + (((unsigned)NOPUSH_MASK_5)<<16),
          208  +    NOPUSH_MASK_6 + (((unsigned)NOPUSH_MASK_7)<<16),
          209  +    NOPUSH_MASK_8 + (((unsigned)NOPUSH_MASK_9)<<16)
   210    210     };
   211    211     assert( op<32*5 );
   212    212     return (masks[op>>5] & (1<<(op&0x1F)));
   213    213   }
   214    214   
   215    215   #ifndef NDEBUG
   216    216   int sqlite3VdbeOpcodeNoPush(u8 op){