aboutsummaryrefslogtreecommitdiff
path: root/src/vdbeapi.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2014-09-18 01:21:43 +0000
committerdrh <drh@noemail.net>2014-09-18 01:21:43 +0000
commit3329a63ac5ca50861d926248b159106cd9fd96a5 (patch)
treef5554b8bf0c7821fb3055e76d6f3a54c5af2832e /src/vdbeapi.c
parentca5506bdc482bbfde2fe3dd6a93f079e9801ce60 (diff)
downloadsqlite-3329a63ac5ca50861d926248b159106cd9fd96a5.tar.gz
sqlite-3329a63ac5ca50861d926248b159106cd9fd96a5.zip
Fix compiler warnings and change the nullMem structure initializer into a
format that MSVC can understand. FossilOrigin-Name: 163bfae8583b2d3002a3a43d6bf8a66fefd73acb
Diffstat (limited to 'src/vdbeapi.c')
-rw-r--r--src/vdbeapi.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index dbfabebbf..ef1167a52 100644
--- 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