Fix compiler warnings and change the nullMem structure initializer into a

format that MSVC can understand.

FossilOrigin-Name: 163bfae8583b2d3002a3a43d6bf8a66fefd73acb

diff --git a/manifest b/manifest
index 12094ebf72f9c5cce13e0ade55bc43b490f43667..a6cdd2c40c23b7d788c24826a9a79a085c5f6bcf 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Performance\simprovement\sand\sslight\ssize\sreduction\sto\sthe\scomparison\soperators\nin\sthe\sVDBE.
-D 2014-09-17T23:37:39.000
+C Fix\scompiler\swarnings\sand\schange\sthe\snullMem\sstructure\sinitializer\sinto\sa\nformat\sthat\sMSVC\scan\sunderstand.
+D 2014-09-18T01:21:43.977
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -194,7 +194,7 @@ F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
 F src/loadext.c de741e66e5ddc1598d904d7289239696e40ed994
 F src/main.c d15621461fb0c52675eba2b650492ed1beef69ab
-F src/malloc.c cc015821ba267ad5c91dc8761d0498a3fc3ce6ce
+F src/malloc.c c6dc1e154eb7d4a33eb737bde2c4103d00007597
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
 F src/mem2.c dce31758da87ec2cfa52ba4c5df1aed6e07d8e8f
@@ -234,7 +234,7 @@ F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
 F src/sqliteInt.h 0803e900eb1882f7dd88e86ddcddd2d1b27c8d86
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
-F src/table.c 218ae2ba022881846741dfc8351aefdf129e0377
+F src/table.c 2e99ef7ef16187e17033d9398dc962ce22dab5cb
 F src/tclsqlite.c c67d310c833046cccc192125d64ad422ab882684
 F src/test1.c 523cd70ded28db71af9a30ec184cbe0957de9575
 F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
@@ -291,7 +291,7 @@ F src/vacuum.c 59f03f92bcff57faa6a8ca256eb29ccddfb0614a
 F src/vdbe.c 78606777e4ce5dba147ab75e71c0127b0d8d4c3d
 F src/vdbe.h 09f5b4e3719fa454f252322b1cdab5cf1f361327
 F src/vdbeInt.h f90b0de6153f50de630a5a113537efb47083812f
-F src/vdbeapi.c c6e63f913bcb12977731a8b12e7e5c5762981527
+F src/vdbeapi.c c02242df5e9e8d1001e0086f405953833f9c426b
 F src/vdbeaux.c 9ac63bc59d2783df77e591e4c4fa8c1153a07eab
 F src/vdbeblob.c 848238dc73e93e48432991bb5651bf87d865eca4
 F src/vdbemem.c 8b5e1083fed2da94e315858a7edf5604a5b91804
@@ -1198,7 +1198,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P fdddb477c89dabb9f7bf2d5ccb32534868df3a03
-R 27b98108123b0758f30cbbc4e2693ca1
+P 14052a7d088bed8196d90a3361ce717a5193bdc8
+R fdb25cd80d01110b7b302f5203339ac7
 U drh
-Z 7dd9c2f8b2084fea7b27f362515d2b5a
+Z 3225a18fbab1063469f56e7e3c1f239a

diff --git a/manifest.uuid b/manifest.uuid
index 2a5acf5d23008cd514bc945a1b3eec10c82c5253..6cec555758dbcb149e60e5d30698dae58e7e8936 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-14052a7d088bed8196d90a3361ce717a5193bdc8
\ No newline at end of file
+163bfae8583b2d3002a3a43d6bf8a66fefd73acb
\ No newline at end of file

diff --git a/src/malloc.c b/src/malloc.c
index daf646bc30f98801a7335fb507ece894f25256a4..a4acd2f0cecb1d4d9730dc2cd3c53283cf3da68b 100644 (file)
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -305,7 +305,7 @@ void *sqlite3Malloc(u64 n){
     p = 0;
   }else if( sqlite3GlobalConfig.bMemstat ){
     sqlite3_mutex_enter(mem0.mutex);
-    mallocWithAlarm(n, &p);
+    mallocWithAlarm((int)n, &p);
     sqlite3_mutex_leave(mem0.mutex);
   }else{
     p = sqlite3GlobalConfig.m.xMalloc((int)n);
@@ -549,7 +549,7 @@ void *sqlite3Realloc(void *pOld, u64 nBytes){
     pNew = pOld;
   }else if( sqlite3GlobalConfig.bMemstat ){
     sqlite3_mutex_enter(mem0.mutex);
-    sqlite3StatusSet(SQLITE_STATUS_MALLOC_SIZE, nBytes);
+    sqlite3StatusSet(SQLITE_STATUS_MALLOC_SIZE, (int)nBytes);
     nDiff = nNew - nOld;
     if( sqlite3StatusValue(SQLITE_STATUS_MEMORY_USED) >= 
           mem0.alarmThreshold-nDiff ){
@@ -559,7 +559,7 @@ void *sqlite3Realloc(void *pOld, u64 nBytes){
     assert( sqlite3MemdebugNoType(pOld, ~MEMTYPE_HEAP) );
     pNew = sqlite3GlobalConfig.m.xRealloc(pOld, nNew);
     if( pNew==0 && mem0.alarmCallback ){
-      sqlite3MallocAlarm(nBytes);
+      sqlite3MallocAlarm((int)nBytes);
       pNew = sqlite3GlobalConfig.m.xRealloc(pOld, nNew);
     }
     if( pNew ){
@@ -699,7 +699,7 @@ void *sqlite3DbRealloc(sqlite3 *db, void *p, u64 n){
       assert( sqlite3MemdebugHasType(p, MEMTYPE_DB) );
       assert( sqlite3MemdebugHasType(p, MEMTYPE_LOOKASIDE|MEMTYPE_HEAP) );
       sqlite3MemdebugSetType(p, MEMTYPE_HEAP);
-      pNew = sqlite3_realloc(p, n);
+      pNew = sqlite3_realloc64(p, n);
       if( !pNew ){
         sqlite3MemdebugSetType(p, MEMTYPE_DB|MEMTYPE_HEAP);
         db->mallocFailed = 1;

diff --git a/src/table.c b/src/table.c
index 12d0cf548e0f4d6442a62f244bbd3bb5f2d3e6aa..c435b2bc02ae04d118e6d22d5bad9c1aa915c395 100644 (file)
--- a/src/table.c
+++ b/src/table.c
@@ -73,7 +73,7 @@ static int sqlite3_get_table_cb(void *pArg, int nCol, char **argv, char **colv){
       if( z==0 ) goto malloc_failed;
       p->azResult[p->nData++] = z;
     }
-  }else if( p->nColumn!=nCol ){
+  }else if( (int)p->nColumn!=nCol ){
     sqlite3_free(p->zErrMsg);
     p->zErrMsg = sqlite3_mprintf(
        "sqlite3_get_table() called with two or more incompatible queries"

diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index dbfabebbf051de2e6e3565dd33fe5aa8e0e695bf..ef1167a52d986a847545e64588480ffb278c9f8b 100644 (file)
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -803,18 +803,18 @@ static const Mem *columnNullValue(void){
     __attribute__((aligned(8))) 
 #endif
     = {
-         .flags      = MEM_Null,
-         .enc        = 0,
-         .n          = 0,
-         .r          = (double)0,
-         .u          = {0},
-         .z          = 0,
-         .zMalloc    = 0,
-         .db         = 0,
-         .xDel       = 0,
+        /* .u          = */ {0},
+        /* .flags      = */ MEM_Null,
+        /* .enc        = */ 0,
+        /* .n          = */ 0,
+        /* .r          = */ (double)0,
+        /* .z          = */ 0,
+        /* .zMalloc    = */ 0,
+        /* .db         = */ 0,
+        /* .xDel       = */ 0,
 #ifdef SQLITE_DEBUG
-         .pScopyFrom = 0,
-         .pFiller    = 0,
+        /* .pScopyFrom = */ 0,
+        /* .pFiller    = */ 0,
 #endif
       };
   return &nullMem;
@@ -1193,7 +1193,7 @@ int sqlite3_bind_blob64(
   if( nData>0x7fffffff ){
     return invokeValueDestructor(zData, xDel, 0);
   }else{
-    return bindText(pStmt, i, zData, nData, xDel, 0);
+    return bindText(pStmt, i, zData, (int)nData, xDel, 0);
   }
 }
 int sqlite3_bind_double(sqlite3_stmt *pStmt, int i, double rValue){
@@ -1250,7 +1250,7 @@ int sqlite3_bind_text64(
     return invokeValueDestructor(zData, xDel, 0);
   }else{
     if( enc==SQLITE_UTF16 ) enc = SQLITE_UTF16NATIVE;
-    return bindText(pStmt, i, zData, nData, xDel, enc);
+    return bindText(pStmt, i, zData, (int)nData, xDel, enc);
   }
 }
 #ifndef SQLITE_OMIT_UTF16