aboutsummaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authormistachkin <mistachkin@noemail.net>2015-01-12 21:43:00 +0000
committermistachkin <mistachkin@noemail.net>2015-01-12 21:43:00 +0000
commit9ab31fcee1b23700863377df7de1af0826b6df9c (patch)
tree5f29dc9c11cff0627a95af0d6f456ceb501b04bd /ext
parent8d9da63dacde128e546f84cb34392188aab1be83 (diff)
parent189143d355334b248d7748ae049a08591ec13d47 (diff)
downloadsqlite-9ab31fcee1b23700863377df7de1af0826b6df9c.tar.gz
sqlite-9ab31fcee1b23700863377df7de1af0826b6df9c.zip
Fix harmless compiler warnings when using -W4 with MSVC.
FossilOrigin-Name: e693e11d1b9265974c32bddba873ea30a4d0b708
Diffstat (limited to 'ext')
-rw-r--r--ext/fts3/fts3.c6
-rw-r--r--ext/fts3/fts3_tokenize_vtab.c2
-rw-r--r--ext/fts3/fts3_write.c4
-rw-r--r--ext/misc/amatch.c2
-rw-r--r--ext/misc/spellfix.c2
-rw-r--r--ext/rtree/rtree.c2
6 files changed, 10 insertions, 8 deletions
diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c
index 2b93c6271..fe28eb2cf 100644
--- a/ext/fts3/fts3.c
+++ b/ext/fts3/fts3.c
@@ -1853,7 +1853,7 @@ static int fts3SelectLeaf(
sqlite3_int64 *piLeaf, /* Selected leaf node */
sqlite3_int64 *piLeaf2 /* Selected leaf node */
){
- int rc; /* Return code */
+ int rc = SQLITE_OK; /* Return code */
int iHeight; /* Height of this node in tree */
assert( piLeaf || piLeaf2 );
@@ -1864,7 +1864,7 @@ static int fts3SelectLeaf(
if( rc==SQLITE_OK && iHeight>1 ){
char *zBlob = 0; /* Blob read from %_segments table */
- int nBlob; /* Size of zBlob in bytes */
+ int nBlob = 0; /* Size of zBlob in bytes */
if( piLeaf && piLeaf2 && (*piLeaf!=*piLeaf2) ){
rc = sqlite3Fts3ReadBlock(p, *piLeaf, &zBlob, &nBlob, 0);
@@ -3086,7 +3086,7 @@ static int fts3FilterMethod(
int nVal, /* Number of elements in apVal */
sqlite3_value **apVal /* Arguments for the indexing scheme */
){
- int rc;
+ int rc = SQLITE_OK;
char *zSql; /* SQL statement used to access %_content */
int eSearch;
Fts3Table *p = (Fts3Table *)pCursor->pVtab;
diff --git a/ext/fts3/fts3_tokenize_vtab.c b/ext/fts3/fts3_tokenize_vtab.c
index 364852ef8..fb99f8b80 100644
--- a/ext/fts3/fts3_tokenize_vtab.c
+++ b/ext/fts3/fts3_tokenize_vtab.c
@@ -163,7 +163,7 @@ static int fts3tokConnectMethod(
sqlite3_vtab **ppVtab, /* OUT: New sqlite3_vtab object */
char **pzErr /* OUT: sqlite3_malloc'd error message */
){
- Fts3tokTable *pTab;
+ Fts3tokTable *pTab = 0;
const sqlite3_tokenizer_module *pMod = 0;
sqlite3_tokenizer *pTok = 0;
int rc;
diff --git a/ext/fts3/fts3_write.c b/ext/fts3/fts3_write.c
index 0da08c62d..09294bc45 100644
--- a/ext/fts3/fts3_write.c
+++ b/ext/fts3/fts3_write.c
@@ -3082,8 +3082,8 @@ static int fts3PromoteSegments(
if( bOk ){
int iIdx = 0;
- sqlite3_stmt *pUpdate1;
- sqlite3_stmt *pUpdate2;
+ sqlite3_stmt *pUpdate1 = 0;
+ sqlite3_stmt *pUpdate2 = 0;
if( rc==SQLITE_OK ){
rc = fts3SqlStmt(p, SQL_UPDATE_LEVEL_IDX, &pUpdate1, 0);
diff --git a/ext/misc/amatch.c b/ext/misc/amatch.c
index d869dbd8d..98c01431b 100644
--- a/ext/misc/amatch.c
+++ b/ext/misc/amatch.c
@@ -398,7 +398,7 @@ static amatch_avl *amatchAvlInsert(amatch_avl **ppHead, amatch_avl *pNew){
*/
static void amatchAvlRemove(amatch_avl **ppHead, amatch_avl *pOld){
amatch_avl **ppParent;
- amatch_avl *pBalance;
+ amatch_avl *pBalance = 0;
/* assert( amatchAvlSearch(*ppHead, pOld->zKey)==pOld ); */
ppParent = amatchAvlFromPtr(pOld, ppHead);
if( pOld->pBefore==0 && pOld->pAfter==0 ){
diff --git a/ext/misc/spellfix.c b/ext/misc/spellfix.c
index 2a26e0839..a6f780584 100644
--- a/ext/misc/spellfix.c
+++ b/ext/misc/spellfix.c
@@ -356,7 +356,7 @@ static int substituteCost(char cPrev, char cFrom, char cTo){
static int editdist1(const char *zA, const char *zB, int *pnMatch){
int nA, nB; /* Number of characters in zA[] and zB[] */
int xA, xB; /* Loop counters for zA[] and zB[] */
- char cA, cB; /* Current character of zA and zB */
+ char cA = 0, cB; /* Current character of zA and zB */
char cAprev, cBprev; /* Previous character of zA and zB */
char cAnext, cBnext; /* Next character in zA and zB */
int d; /* North-west cost value */
diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index 57b38de03..058dc96a4 100644
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -2806,6 +2806,8 @@ static int rtreeUpdate(
rtreeReference(pRtree);
assert(nData>=1);
+ cell.iRowid = 0; /* Used only to suppress a compiler warning */
+
/* Constraint handling. A write operation on an r-tree table may return
** SQLITE_CONSTRAINT for two reasons:
**