Fix harmless compiler warnings in shell.c.in, and a compiler warning in

sqlite3expert.c which is a real error, though also harmless.

FossilOrigin-Name: 56da0e9c0321d1fd3c360722cd6284296f9ba459f6b37ab35c81ecabd18f12e3

diff --git a/ext/expert/sqlite3expert.c b/ext/expert/sqlite3expert.c
index 87543c9d6fb35d3a6160c0e367cbe9d28858ec55..a59e8a1e6fb25f7a394e383faafeeb7836a1f205 100644 (file)
--- a/ext/expert/sqlite3expert.c
+++ b/ext/expert/sqlite3expert.c
@@ -920,7 +920,7 @@ static int idxFindCompatible(
  */
 static int countNonzeros(void* pCount, int nc,
                          char* azResults[], char* azColumns[]){
-  if( nc>0 && azResults[0][0]!='0' || azResults[0][1]!=0 ){
+  if( nc>0 && (azResults[0][0]!='0' || azResults[0][1]!=0) ){
     *((int *)pCount) += 1;
   }
   return 0;

diff --git a/manifest b/manifest
index dc9c49a24e42f795d08caeaca0080983174b3e83..d47348ad6c13f601607d43d616fc3345bb44957e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sincorrect\sassert()\sin\srtree\sthat\swas\sadded\srecently\nby\s[f7ad73c49507c943].\s\sChange\sit\sto\stestcase().
-D 2021-09-22T13:07:10.230
+C Fix\sharmless\scompiler\swarnings\sin\sshell.c.in,\sand\sa\scompiler\swarning\sin\nsqlite3expert.c\swhich\sis\sa\sreal\serror,\sthough\salso\sharmless.
+D 2021-09-22T13:43:16.118
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -51,7 +51,7 @@ F ext/async/sqlite3async.h 46b47c79357b97ad85d20d2795942c0020dc20c532114a4980828
 F ext/expert/README.md b321c2762bb93c18ea102d5a5f7753a4b8bac646cb392b3b437f633caf2020c3
 F ext/expert/expert.c d548d603a4cc9e61f446cc179c120c6713511c413f82a4a32b1e1e69d3f086a4
 F ext/expert/expert1.test 3c642a4e7bbb14f21ddab595436fb465a4733f47a0fe5b2855e1d5ff900ef08e
-F ext/expert/sqlite3expert.c 396c9003d6fe94b6a82311bfe7c30fa430ec7efd56417bf6b32d11737c1624fb
+F ext/expert/sqlite3expert.c 73a57faa14d7d627aae18bfc8dfcdcadc9dc48c6133777f61bebbf8b9bdbab39
 F ext/expert/sqlite3expert.h ca81efc2679a92373a13a3e76a6138d0310e32be53d6c3bfaedabd158ea8969b
 F ext/expert/test_expert.c d56c194b769bdc90cf829a14c9ecbc1edca9c850b837a4d0b13be14095c32a72
 F ext/fts1/README.txt 20ac73b006a70bcfd80069bdaf59214b6cf1db5e
@@ -548,7 +548,7 @@ F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 F src/resolve.c 42b94d37a54200707a95566eff4f7e8a380e32d080016b699f23bd79a73a5028
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 030c3d07326708343208418c84da607752aebc13c92df929b7c68c7c08e7df54
-F src/shell.c.in 937934e6f64502b7c33d1cce2a981a5fc34bb906d203186c3fa6aa24c41303d2
+F src/shell.c.in 0d6ddfcc9b49e94d73406baa6121ab050482dbbab8eb5c77ca2cf6e8b9f6ab0b
 F src/sqlite.h.in 4e977a5e2ed1a9e8987ff65a2cab5f99a4298ebf040ea5ff636e1753339ff45a
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h e97f4e9b509408fea4c4e9bef5a41608dfac343b4d3c7a990dedde1e19af9510
@@ -1925,7 +1925,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 45caf9b85fc75abe80e3d2704fc634e4b103647c912c3fbffb1847d8cb581b62
-R 18c994158855b99a39b5ecbe11efbe96
+P 3aa0bf3a098ee9a62c79f266f94e4d290056d0f3e91237944893d6bbb686861f
+R 02452d96ccf2df8f99cd8b1cd27c57d1
 U drh
-Z fd827f5cffe8a64ecb1c57c1564b8e54
+Z 6efbe061fb0b8100b00437218a7d30c4

diff --git a/manifest.uuid b/manifest.uuid
index 2fd79c54301ea1d0f362a9983c4813512879895d..47a36a53bf6b45fb93dc1347e09d9495931463ae 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3aa0bf3a098ee9a62c79f266f94e4d290056d0f3e91237944893d6bbb686861f
\ No newline at end of file
+56da0e9c0321d1fd3c360722cd6284296f9ba459f6b37ab35c81ecabd18f12e3
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 3d8f9537dd3b6aba58f698f41fa89a16bead596c..c996f580278dbb134d6b8ad8841530299f7f8a1c 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -10640,7 +10640,7 @@ static QuickScanState quickscan(char *zLine, QuickScanState qss){
   char cWait = (char)qss; /* intentional narrowing loss */
   if( cWait==0 ){
   PlainScan:
-    while (cin = *zLine++){
+    while( (cin = *zLine++)!=0 ){
       if( IsSpace(cin) )
         continue;
       switch (cin){
@@ -10676,7 +10676,7 @@ static QuickScanState quickscan(char *zLine, QuickScanState qss){
     }
   }else{
   TermScan:
-    while (cin = *zLine++){
+    while( (cin = *zLine++)!=0 ){
       if( cin==cWait ){
         switch( cWait ){
         case '*':
@@ -10799,7 +10799,6 @@ static int process_input(ShellState *p){
   int nLine;                /* Length of current line */
   int nSql = 0;             /* Bytes of zSql[] used */
   int nAlloc = 0;           /* Allocated zSql[] space */
-  int nSqlPrior = 0;        /* Bytes of zSql[] used by prior line */
   int rc;                   /* Error code */
   int errCnt = 0;           /* Number of errors seen */
   int startline = 0;        /* Line number for start of current input */
@@ -10850,7 +10849,6 @@ static int process_input(ShellState *p){
       zSql = realloc(zSql, nAlloc);
       if( zSql==0 ) shell_out_of_memory();
     }
-    nSqlPrior = nSql;
     if( nSql==0 ){
       int i;
       for(i=0; zLine[i] && IsSpace(zLine[i]); i++){}