aboutsummaryrefslogtreecommitdiff
path: root/ext/misc
diff options
context:
space:
mode:
authormistachkin <mistachkin@noemail.net>2016-04-12 20:05:06 +0000
committermistachkin <mistachkin@noemail.net>2016-04-12 20:05:06 +0000
commit77fac879d25b6500d3bd028a8e855fc9dc789634 (patch)
tree8afdf9e232e8858a52c7f8a6e2426b0f3f80117e /ext/misc
parent02267cc2136bc3cde2ae9cc3a02f91e2dc497793 (diff)
downloadsqlite-77fac879d25b6500d3bd028a8e855fc9dc789634.tar.gz
sqlite-77fac879d25b6500d3bd028a8e855fc9dc789634.zip
More harmless compiler warning fixes.
FossilOrigin-Name: ab69527c1608da0b668f3b49e967661dd99cc3d4
Diffstat (limited to 'ext/misc')
-rw-r--r--ext/misc/amatch.c8
-rw-r--r--ext/misc/fuzzer.c4
-rw-r--r--ext/misc/regexp.c10
-rw-r--r--ext/misc/spellfix.c20
4 files changed, 21 insertions, 21 deletions
diff --git a/ext/misc/amatch.c b/ext/misc/amatch.c
index 852491988..efe76566e 100644
--- a/ext/misc/amatch.c
+++ b/ext/misc/amatch.c
@@ -625,10 +625,10 @@ static int amatchLoadOneRule(
}else{
memset(pRule, 0, sizeof(*pRule));
pRule->zFrom = &pRule->zTo[nTo+1];
- pRule->nFrom = nFrom;
+ pRule->nFrom = (amatch_len)nFrom;
memcpy(pRule->zFrom, zFrom, nFrom+1);
memcpy(pRule->zTo, zTo, nTo+1);
- pRule->nTo = nTo;
+ pRule->nTo = (amatch_len)nTo;
pRule->rCost = rCost;
pRule->iLang = (int)iLang;
}
@@ -1081,7 +1081,7 @@ static void amatchAddWord(
pWord->rCost = rCost;
pWord->iSeq = pCur->nWord++;
amatchWriteCost(pWord);
- pWord->nMatch = nMatch;
+ pWord->nMatch = (short)nMatch;
pWord->pNext = pCur->pAllWords;
pCur->pAllWords = pWord;
pWord->sCost.zKey = pWord->zCost;
@@ -1162,7 +1162,7 @@ static int amatchNext(sqlite3_vtab_cursor *cur){
#endif
nWord = (int)strlen(pWord->zWord+2);
if( nWord+20>nBuf ){
- nBuf = nWord+100;
+ nBuf = (char)(nWord+100);
zBuf = sqlite3_realloc(zBuf, nBuf);
if( zBuf==0 ) return SQLITE_NOMEM;
}
diff --git a/ext/misc/fuzzer.c b/ext/misc/fuzzer.c
index 3ed4b0a97..77db56d47 100644
--- a/ext/misc/fuzzer.c
+++ b/ext/misc/fuzzer.c
@@ -344,10 +344,10 @@ static int fuzzerLoadOneRule(
memset(pRule, 0, sizeof(*pRule));
pRule->zFrom = pRule->zTo;
pRule->zFrom += nTo + 1;
- pRule->nFrom = nFrom;
+ pRule->nFrom = (fuzzer_len)nFrom;
memcpy(pRule->zFrom, zFrom, nFrom+1);
memcpy(pRule->zTo, zTo, nTo+1);
- pRule->nTo = nTo;
+ pRule->nTo = (fuzzer_len)nTo;
pRule->rCost = nCost;
pRule->iRuleset = (int)iRuleset;
}
diff --git a/ext/misc/regexp.c b/ext/misc/regexp.c
index 7244d5299..b4a8ab5c0 100644
--- a/ext/misc/regexp.c
+++ b/ext/misc/regexp.c
@@ -136,7 +136,7 @@ struct ReCompiled {
static void re_add_state(ReStateSet *pSet, int newState){
unsigned i;
for(i=0; i<pSet->nState; i++) if( pSet->aState[i]==newState ) return;
- pSet->aState[pSet->nState++] = newState;
+ pSet->aState[pSet->nState++] = (ReStateNumber)newState;
}
/* Extract the next unicode character from *pzIn and return it. Advance
@@ -358,7 +358,7 @@ static int re_insert(ReCompiled *p, int iBefore, int op, int arg){
p->aArg[i] = p->aArg[i-1];
}
p->nState++;
- p->aOp[iBefore] = op;
+ p->aOp[iBefore] = (char)op;
p->aArg[iBefore] = arg;
return iBefore;
}
@@ -677,12 +677,12 @@ const char *re_compile(ReCompiled **ppRe, const char *zIn, int noCase){
for(j=0, i=1; j<sizeof(pRe->zInit)-2 && pRe->aOp[i]==RE_OP_MATCH; i++){
unsigned x = pRe->aArg[i];
if( x<=127 ){
- pRe->zInit[j++] = x;
+ pRe->zInit[j++] = (unsigned char)x;
}else if( x<=0xfff ){
- pRe->zInit[j++] = 0xc0 | (x>>6);
+ pRe->zInit[j++] = (unsigned char)(0xc0 | (x>>6));
pRe->zInit[j++] = 0x80 | (x&0x3f);
}else if( x<=0xffff ){
- pRe->zInit[j++] = 0xd0 | (x>>12);
+ pRe->zInit[j++] = (unsigned char)(0xd0 | (x>>12));
pRe->zInit[j++] = 0x80 | ((x>>6)&0x3f);
pRe->zInit[j++] = 0x80 | (x&0x3f);
}else{
diff --git a/ext/misc/spellfix.c b/ext/misc/spellfix.c
index b5859ea2c..cbcf8b7c5 100644
--- a/ext/misc/spellfix.c
+++ b/ext/misc/spellfix.c
@@ -390,7 +390,7 @@ static int editdist1(const char *zA, const char *zB, int *pnMatch){
/* Special processing if either string is empty */
if( nA==0 ){
- cBprev = dc;
+ cBprev = (char)dc;
for(xB=res=0; (cB = zB[xB])!=0; xB++){
res += insertOrDeleteCost(cBprev, cB, zB[xB+1])/FINAL_INS_COST_DIV;
cBprev = cB;
@@ -398,7 +398,7 @@ static int editdist1(const char *zA, const char *zB, int *pnMatch){
return res;
}
if( nB==0 ){
- cAprev = dc;
+ cAprev = (char)dc;
for(xA=res=0; (cA = zA[xA])!=0; xA++){
res += insertOrDeleteCost(cAprev, cA, zA[xA+1]);
cAprev = cA;
@@ -420,8 +420,8 @@ static int editdist1(const char *zA, const char *zB, int *pnMatch){
/* Compute the Wagner edit distance */
m[0] = 0;
- cx[0] = dc;
- cBprev = dc;
+ cx[0] = (char)dc;
+ cBprev = (char)dc;
for(xB=1; xB<=nB; xB++){
cBnext = zB[xB];
cB = zB[xB-1];
@@ -429,7 +429,7 @@ static int editdist1(const char *zA, const char *zB, int *pnMatch){
m[xB] = m[xB-1] + insertOrDeleteCost(cBprev, cB, cBnext);
cBprev = cB;
}
- cAprev = dc;
+ cAprev = (char)dc;
for(xA=1; xA<=nA; xA++){
int lastA = (xA==nA);
cA = zA[xA-1];
@@ -476,7 +476,7 @@ static int editdist1(const char *zA, const char *zB, int *pnMatch){
d = m[xB];
dc = cx[xB];
m[xB] = totalCost;
- cx[xB] = ncx;
+ cx[xB] = (char)ncx;
cBprev = cB;
}
cAprev = cA;
@@ -711,9 +711,9 @@ static int editDist3ConfigLoad(
if( nExtra<0 ) nExtra = 0;
pCost = sqlite3_malloc64( sizeof(*pCost) + nExtra );
if( pCost==0 ){ rc = SQLITE_NOMEM; break; }
- pCost->nFrom = nFrom;
- pCost->nTo = nTo;
- pCost->iCost = iCost;
+ pCost->nFrom = (u8)nFrom;
+ pCost->nTo = (u8)nTo;
+ pCost->iCost = (u16)iCost;
memcpy(pCost->a, zFrom, nFrom);
memcpy(pCost->a + nFrom, zTo, nTo);
pCost->pNext = pLang->pCost;
@@ -1616,7 +1616,7 @@ static unsigned char *transliterate(const unsigned char *zIn, int nIn){
zIn += sz;
nIn -= sz;
if( c<=127 ){
- zOut[nOut++] = c;
+ zOut[nOut++] = (unsigned char)c;
}else{
int xTop, xBtm, x;
xTop = sizeof(translit)/sizeof(translit[0]) - 1;