From e4a0d79b8a0cd9cb4a3aa63a48402dd936454ded Mon Sep 17 00:00:00 2001 From: mistachkin Date: Tue, 27 Jan 2015 21:24:33 +0000 Subject: [PATCH] Fix harmless compiler warnings. FossilOrigin-Name: e7d2ec048c88237c124fbe598f8f7e950d43d90f --- ext/fts3/fts3.c | 1 - manifest | 16 ++++++++-------- manifest.uuid | 2 +- src/shell.c | 4 ++-- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c index ec9f0d3181..a1ea533a89 100644 --- a/ext/fts3/fts3.c +++ b/ext/fts3/fts3.c @@ -5656,7 +5656,6 @@ int sqlite3Fts3EvalPhrasePoslist( if( iDocid!=pCsr->iPrevId || pExpr->bEof ){ int rc = SQLITE_OK; int bDescDoclist = pTab->bDescIdx; /* For DOCID_CMP macro */ - int iMul; /* +1 if csr dir matches index dir, else -1 */ int bOr = 0; u8 bEof = 0; u8 bTreeEof = 0; diff --git a/manifest b/manifest index 6c3a6a6028..5e1d55e7c7 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sbug\sin\sthe\sfts3\ssnippet()\sfunction\scausing\sit\sto\somit\sleading\sseparator\scharacters\sfrom\ssnippets\sthat\sbegin\swith\sthe\sfirst\stoken\sin\sa\scolumn. -D 2015-01-27T19:01:26.607 +C Fix\sharmless\scompiler\swarnings. +D 2015-01-27T21:24:33.191 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5407a688f4d77a05c18a8142be8ae5a2829dd610 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -78,7 +78,7 @@ F ext/fts3/README.content fdc666a70d5257a64fee209f97cf89e0e6e32b51 F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a F ext/fts3/README.tokenizers e0a8b81383ea60d0334d274fadf305ea14a8c314 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d -F ext/fts3/fts3.c 845f20440dacac6e09f5c7735205609b9a86536b +F ext/fts3/fts3.c 3b2f792afc04d01d387455932428c8f9ae861cc5 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe F ext/fts3/fts3Int.h 394858c12a17740f7a1f6bd372c4606d4425a8d1 F ext/fts3/fts3_aux.c 5c211e17a64885faeb16b9ba7772f9d5445c2365 @@ -230,7 +230,7 @@ F src/random.c ba2679f80ec82c4190062d756f22d0c358180696 F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e F src/select.c 1f2087523007c42900ffcbdeaef06a23ad9329fc -F src/shell.c 37c6d97399121f2d58b556e0c23d6226b7f55c70 +F src/shell.c efd35900484377d2159189968c3445afefee3e41 F src/sqlite.h.in 9dfc99d6533d36d6a549c4f3f01cacc8be956ada F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d @@ -1237,7 +1237,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 245e8730451fbdc1c729beff7295c452df604009 -R 9b90e66d84773104aa9a7aba84baf66d -U dan -Z f8bb39ab94c5b09db26ae8d1068b8a66 +P adc9283dd9bc3a6463f8c4fe23dd58a3712c349d +R 57729c2b510493b06603a65c6ea41133 +U mistachkin +Z 7155fc25674fe331bcb8023f01301b6b diff --git a/manifest.uuid b/manifest.uuid index 11a99a20cf..fe72374448 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -adc9283dd9bc3a6463f8c4fe23dd58a3712c349d \ No newline at end of file +e7d2ec048c88237c124fbe598f8f7e950d43d90f \ No newline at end of file diff --git a/src/shell.c b/src/shell.c index 40d8cda167..f9a360c7b5 100644 --- a/src/shell.c +++ b/src/shell.c @@ -113,11 +113,11 @@ extern int pclose(FILE*); ** routines take care of that. */ #if defined(_WIN32) || defined(WIN32) -static setBinaryMode(FILE *out){ +static void setBinaryMode(FILE *out){ fflush(out); _setmode(_fileno(out), _O_BINARY); } -static setTextMode(FILE *out){ +static void setTextMode(FILE *out){ fflush(out); _setmode(_fileno(out), _O_TEXT); }