Suppress various compiler warnings.

FossilOrigin-Name: e82d008eaffb5522080cad6c69c1b194b78eadbd

diff --git a/manifest b/manifest
index 3dd5e0e409889e072e8d6d7a43b20e7bbc51d3cd..da200998d761954979bdfbd174e720d8f659102c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Fix\stwo\sasserts\son\sthe\sscratch\sallocator\sto\sallow\sfor\sup\sto\stwo\soutstanding\nscratch\sallocations\sper\sthread.
-D 2010-06-26T20:25:31
+C Suppress\svarious\scompiler\swarnings.
+D 2010-06-26T21:34:06
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -145,10 +145,10 @@ F src/mem1.c 89d4ea8d5cdd55635cbaa48ad53132af6294cbb2
 F src/mem2.c 2ee7bdacda8299b5a91cff9f7ee3e46573195c38
 F src/mem3.c 9b237d911ba9904142a804be727cc6664873f8a3
 F src/mem5.c eb7a5cb98915dd7a086fa415ce3a5a0f20d0acff
-F src/memjournal.c b6c760f64e3c784deeb56bb2b9e8a955563c80bc
+F src/memjournal.c 6a81669d6fbf14813992f48a1a0e2bfe57ec66c6
 F src/mutex.c 6949180803ff05a7d0e2b9334a95b4fb5a00e23f
 F src/mutex.h 6fde601e55fa6c3fae768783c439797ab84c87c6
-F src/mutex_noop.c e6c3e448ac0514b27af1f8949f0347e4340f7af3
+F src/mutex_noop.c 6bd94a6ccdb40ecfdccd75c0e32469f27d355330
 F src/mutex_os2.c 6a62583e374ba3ac1a3fcc0da2bfdac7d3942689
 F src/mutex_unix.c cf84466b4fdd2baa0d5a10bb19f08b2abc1ce42e
 F src/mutex_w32.c 1fe0e735897be20e09dd6f53c3fb516c6b48c0eb
@@ -157,9 +157,9 @@ F src/os.c 9c4a2f82a50306a33907678ec0187b6ad1486bfe
 F src/os.h d7775504a51e6e0d40315aa427b3e229ff9ff9ca
 F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
 F src/os_os2.c 665876d5eec7585226b0a1cf5e18098de2b2da19
-F src/os_unix.c 4b03e5a8a353b51af64ba11ffec85160818b4d89
+F src/os_unix.c ec7c7f7ca224ce2ff58736eebf804b48a75f9946
 F src/os_win.c 48f67798969ba983487fed5691059ade7fff2ef7
-F src/pager.c 363ac12d792e0111ddf27de1e76ae0ed94e815ea
+F src/pager.c 05bd0bd2a665c8e4d4754ac3e476f1e05ee1961c
 F src/pager.h 879fdde5a102d2f21a3135d6f647530b21c2796c
 F src/parse.y ace5c7a125d9f2a410e431ee3209034105045f7e
 F src/pcache.c 1e9aa2dbc0845b52e1b51cc39753b6d1e041cb07
@@ -229,7 +229,7 @@ F src/vdbeblob.c 258a6010ba7a82b72b327fb24c55790655689256
 F src/vdbemem.c 5e579abf6532001dfbee0e640dc34eae897a9807
 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
 F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda
-F src/wal.c c177bd9af1d99da11b2ced469b9f70a47c520ef8
+F src/wal.c b6ce9893a4cb33e5af5321a07f9ba8cb82dac13c
 F src/wal.h 4ace25262452d17e7d3ec970c89ee17794004008
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
 F src/where.c 1c895bef33d0dfc7ed90fb1f74120435d210ea56
@@ -830,14 +830,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 29571e228cc85f7768c3ad57d0c7af96b5a54983
-R 00c2bd7be8afec6a59e72273f1ab30d7
+P f149b498b6ada3fc9f71ee104c351554c80c7f8a
+R 35746cb2feca4ef5d81770ea9fb939bf
 U drh
-Z c4f982247ffd1c88f48964d76577348b
+Z ee43959b6718f1d7aab22b95b6f82fb5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFMJmI+oxKgR168RlERAoSpAJ4l+KyJaanezMkkYJxgloKn2XhHHACaA8eh
-0xUkb3C+vMD00reqw7dY0CA=
-=BMJ5
+iD8DBQFMJnJWoxKgR168RlERAvzDAJ4peDc6+SSpn0rLIShVfdyJhUFA1gCfekd0
+CByatwJ6HEWVuZ3SUiyTUTU=
+=ohUG
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index ff5201f7f6e99945365f39e6c2d64e0a6048b296..84f78d71693779af8d6246152f7e3a42bbe6c5cb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f149b498b6ada3fc9f71ee104c351554c80c7f8a
\ No newline at end of file
+e82d008eaffb5522080cad6c69c1b194b78eadbd
\ No newline at end of file

diff --git a/src/memjournal.c b/src/memjournal.c
index 048304b75561c64a4bbd05a825a9c6948203c83a..fa7fc2ccba8a8607e7234c69afd21a3c6e7091fe 100644 (file)
--- a/src/memjournal.c
+++ b/src/memjournal.c
@@ -226,7 +226,12 @@ static const struct sqlite3_io_methods MemJournalMethods = {
   0,                /* xCheckReservedLock */
   0,                /* xFileControl */
   0,                /* xSectorSize */
-  0                 /* xDeviceCharacteristics */
+  0,                /* xDeviceCharacteristics */
+  0,                /* xShmOpen */
+  0,                /* xShmLock */
+  0,                /* xShmMap */
+  0,                /* xShmBarrier */
+  0                 /* xShmClose */
 };
 
 /* 

diff --git a/src/mutex_noop.c b/src/mutex_noop.c
index ae42c3430c0c9b7f8357289fdbcc2dc3b197b6c8..e1e3b3288b27dad0fd8c1b99f07abbd61f673010 100644 (file)
--- a/src/mutex_noop.c
+++ b/src/mutex_noop.c
@@ -37,11 +37,17 @@
 */
 static int noopMutexInit(void){ return SQLITE_OK; }
 static int noopMutexEnd(void){ return SQLITE_OK; }
-static sqlite3_mutex *noopMutexAlloc(int id){ return (sqlite3_mutex*)8; }
-static void noopMutexFree(sqlite3_mutex *p){ return; }
-static void noopMutexEnter(sqlite3_mutex *p){ return; }
-static int noopMutexTry(sqlite3_mutex *p){ return SQLITE_OK; }
-static void noopMutexLeave(sqlite3_mutex *p){ return; }
+static sqlite3_mutex *noopMutexAlloc(int id){ 
+  UNUSED_PARAMETER(id);
+  return (sqlite3_mutex*)8; 
+}
+static void noopMutexFree(sqlite3_mutex *p){ UNUSED_PARAMETER(p); return; }
+static void noopMutexEnter(sqlite3_mutex *p){ UNUSED_PARAMETER(p); return; }
+static int noopMutexTry(sqlite3_mutex *p){
+  UNUSED_PARAMETER(p);
+  return SQLITE_OK;
+}
+static void noopMutexLeave(sqlite3_mutex *p){ UNUSED_PARAMETER(p); return; }
 
 sqlite3_mutex_methods const *sqlite3NoopMutex(void){
   static const sqlite3_mutex_methods sMutex = {

diff --git a/src/os_unix.c b/src/os_unix.c
index 6cad8f0084740bebd3cbb2eedf9be7f740fe74d2..06712668b6e7745a330d6822679071ce3d1218f2 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -3546,6 +3546,7 @@ static int unixShmLock(
 static void unixShmBarrier(
   sqlite3_file *fd                /* Database file holding the shared memory */
 ){
+  UNUSED_PARAMETER(fd);
   unixEnterMutex();
   unixLeaveMutex();
 }
@@ -4838,6 +4839,7 @@ static int unixCurrentTimeInt64(sqlite3_vfs *NotUsed, sqlite3_int64 *piNow){
 */
 static int unixCurrentTime(sqlite3_vfs *NotUsed, double *prNow){
   sqlite3_int64 i;
+  UNUSED_PARAMETER(NotUsed);
   unixCurrentTimeInt64(0, &i);
   *prNow = i/86400000.0;
   return 0;

diff --git a/src/pager.c b/src/pager.c
index 215049e47eb75d7724a04818a7512dc8d6b04594..1d816b0848c90fbcb6eb793334df6832a861e0fa 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -4201,7 +4201,7 @@ int sqlite3PagerSharedLock(Pager *pPager){
       ** detected.  The chance of an undetected change is so small that
       ** it can be neglected.
       */
-      int nPage;
+      int nPage = 0;
       char dbFileVers[sizeof(pPager->dbFileVers)];
       sqlite3PagerPagecount(pPager, &nPage);
 

diff --git a/src/wal.c b/src/wal.c
index d74456fec69ac4f1dd5c6154df38b737ab6bd337..3aaf7759c4cb658d9480c9bf2ebb2fe926abe9af 100644 (file)
--- a/src/wal.c
+++ b/src/wal.c
@@ -865,9 +865,9 @@ static u32 walFramePgno(Wal *pWal, u32 iFrame){
 ** actually needed.
 */
 static void walCleanupHash(Wal *pWal){
-  volatile ht_slot *aHash;        /* Pointer to hash table to clear */
-  volatile u32 *aPgno;            /* Page number array for hash table */
-  u32 iZero;                      /* frame == (aHash[x]+iZero) */
+  volatile ht_slot *aHash = 0;    /* Pointer to hash table to clear */
+  volatile u32 *aPgno = 0;        /* Page number array for hash table */
+  u32 iZero = 0;                  /* frame == (aHash[x]+iZero) */
   int iLimit = 0;                 /* Zero values greater than this */
   int nByte;                      /* Number of bytes to zero in aPgno[] */
   int i;                          /* Used to iterate through aHash[] */
@@ -928,9 +928,9 @@ static void walCleanupHash(Wal *pWal){
 */
 static int walIndexAppend(Wal *pWal, u32 iFrame, u32 iPage){
   int rc;                         /* Return code */
-  u32 iZero;                      /* One less than frame number of aPgno[1] */
-  volatile u32 *aPgno;            /* Page number array */
-  volatile ht_slot *aHash;        /* Hash table */
+  u32 iZero = 0;                  /* One less than frame number of aPgno[1] */
+  volatile u32 *aPgno = 0;        /* Page number array */
+  volatile ht_slot *aHash = 0;    /* Hash table */
 
   rc = walHashGet(pWal, walFramePage(iFrame), &aHash, &aPgno, &iZero);
 
@@ -1345,8 +1345,8 @@ static void walMergesort(
   };
 
   const int nList = *pnList;      /* Size of input list */
-  int nMerge;                     /* Number of elements in list aMerge */
-  ht_slot *aMerge;                /* List to be merged */
+  int nMerge = 0;                 /* Number of elements in list aMerge */
+  ht_slot *aMerge = 0;            /* List to be merged */
   int iList;                      /* Index into input list */
   int iSub = 0;                   /* Index into aSub array */
   struct Sublist aSub[13];        /* Array of sub-lists */
@@ -1456,7 +1456,7 @@ static int walIteratorInit(Wal *pWal, WalIterator **pp){
       ht_slot *aIndex;            /* Sorted index for this segment */
 
       aPgno++;
-      nEntry = ((i+1)==nSegment)?iLast-iZero:(u32 *)aHash-(u32 *)aPgno;
+      nEntry = ((i+1)==nSegment)?(int)(iLast-iZero):(u32 *)aHash-(u32 *)aPgno;
       aIndex = &((ht_slot *)&p->aSegment[p->nSegment])[iZero];
       iZero++;