Fix a couple of harmless nuisance warnings. (CVS 6438)

FossilOrigin-Name: 53dac0a455b9a822f710c257711e8d319060cf84

diff --git a/manifest b/manifest
index 8fcc3d2fc13c895997987e086fe1163bcdd61169..6c66bfeaca0ea6d86acd50a7a934cb96c21fbbb0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\sthe\squery\sflattening\soptimization\swhen\sthe\ssubquery\sis\sa\scompound\nquery\swith\san\sORDER\sBY\sclause.\s\sTicket\s#3773\sshows\swhy\sthat\scombination\ndoes\snot\swork.\s(CVS\s6437)
-D 2009-04-02T16:59:47
+C Fix\sa\scouple\sof\sharmless\snuisance\swarnings.\s(CVS\s6438)
+D 2009-04-02T17:22:42
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -122,14 +122,14 @@ F src/insert.c 71286d081a919a27ef22eaeccbe2718f93dc6aa9
 F src/journal.c e00df0c0da8413ab6e1bb7d7cab5665d4a9000d0
 F src/legacy.c 2ad5b52df322d0f132f66817095e0e79c8942611
 F src/loadext.c 3f96631089fc4f3871a67f02f2e4fc7ea4d51edc
-F src/main.c 95e13cd23b7a88e33c1acfe233c748fd9dd7e467
+F src/main.c 5e36e465932ad2b80c38b85dc82d2f2bf6e0f8ae
 F src/malloc.c a1f0f8ae110abb8eb546e259ab0eaea7e0f9b588
 F src/mem0.c f2f84062d1f35814d6535c9f9e33de3bfb3b132c
 F src/mem1.c e6d5c23941288df8191b8a98c28e3f57771e2270
 F src/mem2.c d02bd6a5b34f2d59012a852615621939d9c09548
 F src/mem3.c 67153ec933e08b70714055e872efb58a6b287939
 F src/mem5.c 838309b521c96a2a34507f74a5a739d28de4aac6
-F src/memjournal.c 2fc78ced7b47ba54efbf15a129f09e0733f6adbd
+F src/memjournal.c d6f5cc35cdba795fc3d39812c5669cc012b5ed6f
 F src/mutex.c 5e2ea0e0490a3567dc08a014bcee748c0cea727f
 F src/mutex.h 9e686e83a88838dac8b9c51271c651e833060f1e
 F src/mutex_noop.c f5a07671f25a1a9bd7c10ad7107bc2585446200f
@@ -715,7 +715,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 995f2b9b1031fadc85e179701536b9dd4153654b
-R 46fe8bc037aad00af46b1a5a3fe7667b
+P 23f90d50737a36ebd17152dd4667948ce7049967
+R a1a1a4239b62dbb22521cfb4e8b651fc
 U drh
-Z e4c9dcb4224dad890dcbd3f746876a28
+Z fa40ccceb3f1316325395133ac351b79

diff --git a/manifest.uuid b/manifest.uuid
index fa10f36f7b39ee4c864996dd7b843b00715cce7c..9b6201c25ae29fcacde45cada1b353da6db0643e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-23f90d50737a36ebd17152dd4667948ce7049967
\ No newline at end of file
+53dac0a455b9a822f710c257711e8d319060cf84
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 072e14e07fd3eb229798165cd04876fbbe70f50d..57a1a86c22d2731924ede89ad61bd65c6588ac04 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.534 2009/03/23 04:33:32 danielk1977 Exp $
+** $Id: main.c,v 1.535 2009/04/02 17:22:42 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -418,7 +418,7 @@ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){
   if( pStart ){
     int i;
     LookasideSlot *p;
-    assert( sz > sizeof(LookasideSlot*) );
+    assert( sz > (int)sizeof(LookasideSlot*) );
     p = (LookasideSlot*)pStart;
     for(i=cnt-1; i>=0; i--){
       p->pNext = db->lookaside.pFree;

diff --git a/src/memjournal.c b/src/memjournal.c
index 930c7857192de10b54d841affa30f1022fcc0941..0261fefa2d558602e5d3326d2838c588d354735f 100644 (file)
--- a/src/memjournal.c
+++ b/src/memjournal.c
@@ -14,7 +14,7 @@
 ** The in-memory rollback journal is used to journal transactions for
 ** ":memory:" databases and when the journal_mode=MEMORY pragma is used.
 **
-** @(#) $Id: memjournal.c,v 1.9 2009/04/01 23:09:44 drh Exp $
+** @(#) $Id: memjournal.c,v 1.10 2009/04/02 17:22:42 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -31,7 +31,7 @@ typedef struct FileChunk FileChunk;
 ** a power-of-two allocation.  This mimimizes wasted space in power-of-two
 ** memory allocators.
 */
-#define JOURNAL_CHUNKSIZE (1024-sizeof(FileChunk*))
+#define JOURNAL_CHUNKSIZE ((int)(1024-sizeof(FileChunk*)))
 
 /* Macro to find the minimum of two numeric values.
 */