Fix a compile error in an assert() and a warning with MSVC builds. (CVS 6032)

FossilOrigin-Name: 8b8f6a6ab597e06e60557ab56c6ee7f8522ed570

diff --git a/manifest b/manifest
index ff409d41495daa489f1b5922f410fe579f7f1f72..9887996fc2524260cb2663c1dd08f6a7bace50a6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\sthe\smemory\sreturned\sfrom\ssqlite3ScratchMalloc()\sis\s8-byte\saligned.\nTicket\s#3542.\s(CVS\s6031)
-D 2008-12-16T13:46:30
+C Fix\sa\scompile\serror\sin\san\sassert()\sand\sa\swarning\swith\sMSVC\sbuilds.\s(CVS\s6032)
+D 2008-12-16T17:20:38
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in f7e4c81c347b04f7b0f1c1b081a168645d7b8af7
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -120,7 +120,7 @@ F src/journal.c cffd2cd214e58c0e99c3ff632b3bee6c7cbb260e
 F src/legacy.c 4f7410b29598d991628ca40b150aa089649f17d8
 F src/loadext.c 2f53996c693a347edc2d773e9217dde49d96ae64
 F src/main.c 64857582ae00cc638973cbc47997d25fdbf26cf6
-F src/malloc.c a0bd0c111550935ea30510f2ccdf3a769e9f7a56
+F src/malloc.c e2b4e6d7033372bd43adb0192bf5f64c0aa03c91
 F src/mem0.c f2f84062d1f35814d6535c9f9e33de3bfb3b132c
 F src/mem1.c 3bfb39e4f60b0179713a7c087b2d4f0dc205735f
 F src/mem2.c 4c53c0071d3c68b8f252fe85d1667bad59421396
@@ -198,7 +198,7 @@ F src/vdbe.c 3fd1fe6408598121213e19e1808e5de882c7b636
 F src/vdbe.h 03516f28bf5aca00a53c4dccd6c313f96adb94f6
 F src/vdbeInt.h e6e80a99ce634983b7cc2498843b4d2e5540900a
 F src/vdbeapi.c 85c33cfbfa56249cbe627831610afafba754477d
-F src/vdbeaux.c d3a785736a7dc46a3950d393008f1ee939198a48
+F src/vdbeaux.c 6f9b43870a92056fb02d8c19ac5c3a861a15cc26
 F src/vdbeblob.c b0dcebfafedcf9c0addc7901ad98f6f986c08935
 F src/vdbemem.c f9c859ac17e2e05a0f249868ce4f191f69edd31d
 F src/vtab.c e39e011d7443a8d574b1b9cde207a35522e6df43
@@ -675,7 +675,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 230cb68e07ec791fa4a46dee8506716d52a99426
-R ef984ad615c40ec03c45bf9ef50a768d
-U drh
-Z a906cffd56914bdaf5c9ddf8c186ccae
+P 13b56b7ff97c3abc116dae934f6d1330bbb7762d
+R a6ff965a91307b50874e830368f8fcd6
+U shane
+Z 14bafe5c87d4adcff35382b456920762

diff --git a/manifest.uuid b/manifest.uuid
index f04812ca8f83c6da55af7532676c662f66277ff7..efad820ac04c463a3f9544b07a30db6f0ebbd1d3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-13b56b7ff97c3abc116dae934f6d1330bbb7762d
\ No newline at end of file
+8b8f6a6ab597e06e60557ab56c6ee7f8522ed570
\ No newline at end of file

diff --git a/src/malloc.c b/src/malloc.c
index 79e2054b5af88744fd33fa4d09f96988cd6d206a..f4fc0d325da3d753d91682441d27126c8b25ccb4 100644 (file)
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -12,7 +12,7 @@
 **
 ** Memory allocation functions used throughout sqlite.
 **
-** $Id: malloc.c,v 1.52 2008/12/16 13:46:30 drh Exp $
+** $Id: malloc.c,v 1.53 2008/12/16 17:20:38 shane Exp $
 */
 #include "sqliteInt.h"
 #include <stdarg.h>
@@ -335,7 +335,7 @@ void *sqlite3ScratchMalloc(int n){
       sqlite3StatusSet(SQLITE_STATUS_SCRATCH_SIZE, n);
       sqlite3_mutex_leave(mem0.mutex);
       p = (void*)&((char*)sqlite3GlobalConfig.pScratch)[i];
-      assert(  ((p - (void*)0) & 7)==0 );
+      assert(  (((u8*)p - (u8*)0) & 7)==0 );
     }
   }
 #if SQLITE_THREADSAFE==0 && !defined(NDEBUG)

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 943817cc57eba49e58c20a78b9e9e053bce4bc57..537e8cffc5ca530b00631810e74f6ee824bb4f37 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -14,7 +14,7 @@
 ** to version 2.8.7, all this code was combined into the vdbe.c source file.
 ** But that file was getting too big so this subroutines were split out.
 **
-** $Id: vdbeaux.c,v 1.427 2008/12/11 16:17:04 drh Exp $
+** $Id: vdbeaux.c,v 1.428 2008/12/16 17:20:38 shane Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -2416,7 +2416,7 @@ int sqlite3VdbeIdxRowid(BtCursor *pCur, i64 *rowid){
   (void)getVarint32((u8*)m.z, szHdr);
   testcase( szHdr==2 );
   testcase( szHdr==m.n );
-  if( unlikely(szHdr<2 || szHdr>m.n) ){
+  if( unlikely(szHdr<2 || (int)szHdr>m.n) ){
     goto idx_rowid_corruption;
   }