Fix harmless compiler warnings.

FossilOrigin-Name: bfc7b84b766860d2e410702ba7c1166d7328309a
This commit is contained in:
mistachkin 2015-09-11 18:05:01 +00:00
parent e98b6fab47
commit 16a93128f8
4 changed files with 20 additions and 18 deletions

View File

@ -5275,7 +5275,7 @@ static int fts5DecodePoslist(int *pRc, Fts5Buffer *pBuf, const u8 *a, int n){
** The return value is the number of bytes read from the input buffer.
*/
static int fts5DecodeDoclist(int *pRc, Fts5Buffer *pBuf, const u8 *a, int n){
i64 iDocid;
i64 iDocid = 0;
int iOff = 0;
if( n>0 ){

View File

@ -495,12 +495,12 @@ static void jsonReturn(
}
if( v==0 ) break;
if( v<=0x7f ){
zOut[j++] = v;
zOut[j++] = (char)v;
}else if( v<=0x7ff ){
zOut[j++] = 0xc0 | (v>>6);
zOut[j++] = (char)(0xc0 | (v>>6));
zOut[j++] = 0x80 | (v&0x3f);
}else{
zOut[j++] = 0xe0 | (v>>12);
zOut[j++] = (char)(0xe0 | (v>>12));
zOut[j++] = 0x80 | ((v>>6)&0x3f);
zOut[j++] = 0x80 | (v&0x3f);
}
@ -1053,6 +1053,7 @@ static void jsonTest1Func(
int argc,
sqlite3_value **argv
){
UNUSED_PARAM(argc);
sqlite3_result_int(ctx, sqlite3_value_subtype(argv[0])==JSON_SUBTYPE);
}
#endif /* SQLITE_DEBUG */
@ -1274,8 +1275,8 @@ static void jsonReplaceFunc(
pNode = jsonLookup(&x, zPath, 0, ctx);
if( x.nErr ) goto replace_err;
if( pNode ){
pNode->jnFlags |= JNODE_REPLACE;
pNode->iVal = i+1;
pNode->jnFlags |= (u8)JNODE_REPLACE;
pNode->iVal = (u8)(i+1);
}
}
if( x.aNode[0].jnFlags & JNODE_REPLACE ){
@ -1329,8 +1330,8 @@ static void jsonSetFunc(
}else if( x.nErr ){
goto jsonSetDone;
}else if( pNode && (bApnd || bIsSet) ){
pNode->jnFlags |= JNODE_REPLACE;
pNode->iVal = i+1;
pNode->jnFlags |= (u8)JNODE_REPLACE;
pNode->iVal = (u8)(i+1);
}
}
if( x.aNode[0].jnFlags & JNODE_REPLACE ){
@ -1388,6 +1389,7 @@ static void jsonValidFunc(
JsonParse x; /* The parse */
int rc = 0;
UNUSED_PARAM(argc);
if( jsonParse(&x, 0, (const char*)sqlite3_value_text(argv[0]))==0
&& x.nNode>0
){
@ -1734,7 +1736,7 @@ static int jsonEachFilter(
){
JsonEachCursor *p = (JsonEachCursor*)cur;
const char *z;
const char *zRoot;
const char *zRoot = 0;
sqlite3_int64 n;
UNUSED_PARAM(idxStr);

View File

@ -1,5 +1,5 @@
C More\stest\scases\sin\stest/json102.test\scorresponding\sto\snew\sexamples\sin\sthe\njson1\sdocumentation.
D 2015-09-11T15:32:33.147
C Fix\sharmless\scompiler\swarnings.
D 2015-09-11T18:05:01.352
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -112,7 +112,7 @@ F ext/fts5/fts5_buffer.c 64dcaf36a3ebda9e84b7c3b8788887ec325e12a4
F ext/fts5/fts5_config.c 57ee5fe71578cb494574fc0e6e51acb9a22a8695
F ext/fts5/fts5_expr.c 667faaf14a69a5683ac383acdc8d942cf32c3f93
F ext/fts5/fts5_hash.c 4bf4b99708848357b8a2b5819e509eb6d3df9246
F ext/fts5/fts5_index.c c07522cc5632d0d211402c0e6273ecb7493886d4
F ext/fts5/fts5_index.c 62a682a70ea2e84fa67c7786ead892b201116ad1
F ext/fts5/fts5_main.c 3fa906f6c0177caf8f82862bc70f37b28bb3305c
F ext/fts5/fts5_storage.c 120f7b143688b5b7710dacbd48cff211609b8059
F ext/fts5/fts5_tcl.c 6da58d6e8f42a93c4486b5ba9b187a7f995dee37
@ -195,7 +195,7 @@ F ext/misc/eval.c f971962e92ebb8b0a4e6b62949463ee454d88fa2
F ext/misc/fileio.c d4171c815d6543a9edef8308aab2951413cd8d0f
F ext/misc/fuzzer.c 4c84635c71c26cfa7c2e5848cf49fe2d2cfcd767
F ext/misc/ieee754.c b0362167289170627659e84173f5d2e8fee8566e
F ext/misc/json1.c 96490b8e34299a416ab221f827e0369344d95c53
F ext/misc/json1.c f35d00fbd79a7e23af18d7630a2fcf22dce3692b
F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
F ext/misc/percentile.c bcbee3c061b884eccb80e21651daaae8e1e43c63
F ext/misc/regexp.c af92cdaa5058fcec1451e49becc7ba44dba023dc
@ -1386,7 +1386,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 0dc436116e55e3fd55eb6085ada71e099069b32d
R 6a1dee4bd5e0067c0115e5b47549c01a
U drh
Z 3b3b3aa659d24a2dd31ae86f119af47f
P f599a42e190b4b89d74055402143c5487985cd90
R 0604cd6b1b67b982add6999f3d35855f
U mistachkin
Z 360c245eb92b0ddf2395cd1ae9027341

View File

@ -1 +1 @@
f599a42e190b4b89d74055402143c5487985cd90
bfc7b84b766860d2e410702ba7c1166d7328309a