Fix compiler warnings by removing surplus local variables in the schema

pretty-printer logic of the command-line shell.

FossilOrigin-Name: 55a62483b9121a8b373d038a26fdebc4308661f6

diff --git a/manifest b/manifest
index 967ecce51b001697889e8f25c526b39737e15b07..99045262534857f19e3232dd5521787bc77304d3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixes\sfor\sharmless\scompiler\swarnings.
-D 2016-04-13T15:52:16.297
+C Fix\scompiler\swarnings\sby\sremoving\ssurplus\slocal\svariables\sin\sthe\sschema\npretty-printer\slogic\sof\sthe\scommand-line\sshell.
+D 2016-04-13T21:00:36.984
 F Makefile.in eba680121821b8a60940a81454316f47a341487a
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836
@@ -376,7 +376,7 @@ F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c b8f7174e5f8c33c44ded3a25a973d0bb89228c20
 F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e
 F src/select.c a07e6022e2b559f3c2ec80442472c5965fa7a3fc
-F src/shell.c aeaab68456010319cb71406cbaca05865b295154
+F src/shell.c ebcdf99f3e7c7409bd463eae443f1bd01e3e2d02
 F src/sqlite.h.in 64eb70a3b309751bebf73a5552a51244f68f0ea5
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 98f72cbfe00169c39089115427d06ea05fe4b4a2
@@ -1482,8 +1482,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 83cfe82cd6d31ec0a6193525fd92e63a2a43b142 929fa4c31e7c5b8c6cbb1412478ea91b15ad5529
-R 7c661a721c213e6ed7f2c57fe9448b49
-T +closed 929fa4c31e7c5b8c6cbb1412478ea91b15ad5529
+P 68142dc541b7a0a36fcb075a26f10f03c1e7c422
+R df66fcce8d8333da43cbdaefe267859a
 U drh
-Z 9101c9e33a00c3414d9af87354786d43
+Z 3bcaedd99c30eef242301f45d5550540

diff --git a/manifest.uuid b/manifest.uuid
index 420021215edc9c343b4c1c241f71d7314bdf1ee1..c1466783ea81112094bf64b69113e2d23239cf65 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-68142dc541b7a0a36fcb075a26f10f03c1e7c422
\ No newline at end of file
+55a62483b9121a8b373d038a26fdebc4308661f6
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index 33010e5ff127ece2b3975610fe8213fd6bf7b82c..4744b91dddd798fddfd1a336d5733130f8ac93cc 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -1062,7 +1062,7 @@ static int shell_callback(
     }
     case MODE_Pretty: {  /* .schema and .fullschema with --indent */
       char *z;
-      int i,j;
+      int j;
       int nParen = 0;
       char cEnd = 0;
       char c;
@@ -1089,8 +1089,7 @@ static int shell_callback(
       while( j>0 && IsSpace(z[j-1]) ){ j--; }
       z[j] = 0;
       if( strlen30(z)>=79 ){
-        for(i=j=0; z[i]; i++){
-          char c = z[i];
+        for(i=j=0; (c = z[i])!=0; i++){
           if( c==cEnd ){
             cEnd = 0;
           }else if( c=='"' || c=='\'' || c=='`' ){