From: drh <drh@noemail.net>
Date: Mon, 11 Aug 2014 14:21:32 +0000 (+0000)
Subject: Fix harmless compiler warnings.
X-Git-Tag: version-3.8.6~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=490fe86f1a74ca24703b7b63a656915d49180b72;p=thirdparty%2Fsqlite.git

Fix harmless compiler warnings.

FossilOrigin-Name: 52b03f045edf6fc29f9ba9a5cac53a59f0feb0eb
---

diff --git a/ext/fts3/fts3_unicode.c b/ext/fts3/fts3_unicode.c
index 57e7a4d3c9..94fc27b5b4 100644
--- a/ext/fts3/fts3_unicode.c
+++ b/ext/fts3/fts3_unicode.c
@@ -318,7 +318,7 @@ static int unicodeNext(
 ){
   unicode_cursor *pCsr = (unicode_cursor *)pC;
   unicode_tokenizer *p = ((unicode_tokenizer *)pCsr->base.pTokenizer);
-  int iCode;
+  int iCode = 0;
   char *zOut;
   const unsigned char *z = &pCsr->aInput[pCsr->iOff];
   const unsigned char *zStart = z;
diff --git a/ext/misc/fileio.c b/ext/misc/fileio.c
index f80949bff2..fbe2d030c0 100644
--- a/ext/misc/fileio.c
+++ b/ext/misc/fileio.c
@@ -61,7 +61,6 @@ static void writefileFunc(
 ){
   FILE *out;
   const char *z;
-  int n;
   sqlite3_int64 rc;
   const char *zFile;
 
@@ -71,11 +70,9 @@ static void writefileFunc(
   if( out==0 ) return;
   z = (const char*)sqlite3_value_blob(argv[1]);
   if( z==0 ){
-    n = 0;
     rc = 0;
   }else{
-    n = sqlite3_value_bytes(argv[1]);
-    rc = fwrite(z, 1, n, out);
+    rc = fwrite(z, 1, sqlite3_value_bytes(argv[1]), out);
   }
   fclose(out);
   sqlite3_result_int64(context, rc);
diff --git a/manifest b/manifest
index 8b2db457d5..0039113b6b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Changes\sthat\swill\sperhaps\senable\sSQLite\sto\swork\sbetter\son\sVxWorks.
-D 2014-08-11T13:53:30.969
+C Fix\sharmless\scompiler\swarnings.
+D 2014-08-11T14:21:32.900
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -94,7 +94,7 @@ F ext/fts3/fts3_tokenize_vtab.c 011170fe9eba5ff062f1a31d3188e00267716706
 F ext/fts3/fts3_tokenizer.c bbdc731bc91338050675c6d1da9ab82147391e16
 F ext/fts3/fts3_tokenizer.h 64c6ef6c5272c51ebe60fc607a896e84288fcbc3
 F ext/fts3/fts3_tokenizer1.c 5c98225a53705e5ee34824087478cf477bdb7004
-F ext/fts3/fts3_unicode.c e80eef8a11f2020dc9c1eb95c5b405b9012f2fbe
+F ext/fts3/fts3_unicode.c a93f5edc0aff44ef8b06d7cb55b52026541ca145
 F ext/fts3/fts3_unicode2.c c3d01968d497bd7001e7dc774ba75b372738c057
 F ext/fts3/fts3_write.c 8260388626516a7005d06a9dce94f9e55c6c2a41
 F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9
@@ -109,7 +109,7 @@ F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
 F ext/misc/amatch.c 678056a4bfcd83c4e82dea81d37543cd1d6dbee1
 F ext/misc/closure.c 636024302cde41b2bf0c542f81c40c624cfb7012
 F ext/misc/compress.c 76e45655f4046e756064ab10c62e18f2eb846b9f
-F ext/misc/fileio.c beea82bb5055b6590cffe2d2e6d922905894f691
+F ext/misc/fileio.c d4171c815d6543a9edef8308aab2951413cd8d0f
 F ext/misc/fuzzer.c 136533c53cfce0957f0b48fa11dba27e21c5c01d
 F ext/misc/ieee754.c b0362167289170627659e84173f5d2e8fee8566e
 F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
@@ -223,7 +223,7 @@ F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
 F src/resolve.c 44e2e434deaef2b41d4410ede695d867deb89886
 F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
 F src/select.c 1529c49075464c5a95fde77314073612b1b8d595
-F src/shell.c 4af71e7f25af6da6debda87dcbd6be37da710916
+F src/shell.c 75bb7bd2c80bb44861598f322a417c4bafe98fd7
 F src/sqlite.h.in 66a923e0d8a3a771a7050f292cc8028b8c711652
 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
 F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
@@ -1185,7 +1185,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 7556bd9aa5db1b9cd92d0e48effcda9fe96f3128
-R 07fe7ef4c70cea44dc683244e34b47a2
+P de27c742c0dcda20b51339598bf6094a8dcf5fb9
+R b22e48d145e96418fb870a5b38049ca4
 U drh
-Z c5b6316215c9354c3470fdb843673338
+Z 67a30f4afb77c4b424be11cabe826966
diff --git a/manifest.uuid b/manifest.uuid
index b1e2fcea2d..832743ad81 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-de27c742c0dcda20b51339598bf6094a8dcf5fb9
\ No newline at end of file
+52b03f045edf6fc29f9ba9a5cac53a59f0feb0eb
\ No newline at end of file
diff --git a/src/shell.c b/src/shell.c
index e9ecf194b6..a74dcdb85d 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -1694,7 +1694,6 @@ static void writefileFunc(
 ){
   FILE *out;
   const char *z;
-  int n;
   sqlite3_int64 rc;
   const char *zFile;
 
@@ -1704,11 +1703,9 @@ static void writefileFunc(
   if( out==0 ) return;
   z = (const char*)sqlite3_value_blob(argv[1]);
   if( z==0 ){
-    n = 0;
     rc = 0;
   }else{
-    n = sqlite3_value_bytes(argv[1]);
-    rc = fwrite(z, 1, n, out);
+    rc = fwrite(z, 1, sqlite3_value_bytes(argv[1]), out);
   }
   fclose(out);
   sqlite3_result_int64(context, rc);