Remove a stray "&" character in the CLI, detected by a clang warning.

FossilOrigin-Name: 5865d2f2d0333024366ecf1d919535fd4ec05c637feff16d75028ccdc8db4b50

diff --git a/manifest b/manifest
index 5688260174e05fbe41b64d148aca3e8b5ab25b72..1c917dad382b6cf2f6532cc054c9c95808c0f937 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\s"shelltest"\starget\sto\sthe\sMSVC\smakefile\sas\swell.
-D 2020-05-29T19:45:03.464
+C Remove\sa\sstray\s"&"\scharacter\sin\sthe\sCLI,\sdetected\sby\sa\sclang\swarning.
+D 2020-05-29T20:16:19.429
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -534,7 +534,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c c2008519a0654f1e7490e9281ed0397d0f14bb840d81f0b96946248afcbdb25d
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 39a00a8bc89596dfb37c16afcbb1d33de5085b9963564b58aafe1566d08c0881
-F src/shell.c.in 5074277ad9469c281bc9dce86fd15aeffffffc2735ae2f912561dfcc5101d267
+F src/shell.c.in 1c47af1236007851fbded02bcdca020415f35e215cb161adbe2cf06f9ca70b99
 F src/sqlite.h.in 74342b41e9d68ff9e56b192009046f8dd0aa2bd76ce1a588f330de614ba61de7
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 2d1af80082edffd71c6f96f70ad1ce6a4fb46615ad10291fc77fe0dea9ff0197
@@ -1866,7 +1866,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 50d4ddf1330b88551de51439eb535f385dee6b53013802dd62f832d16b3025b6
-R f806000b80d1906a07120f53d52bf9b7
+P 9924c0456bfcd2058c9620a93dfbfd4c7d960c68910ce6aed7364dff42baba5c
+R 85938626fdde133bf2bbed9b50812696
 U drh
-Z 7d0d8f75af2aa05c25ec32eee4f87b2f
+Z a7ec4245396908b4263f1a81f6c6a7ec

diff --git a/manifest.uuid b/manifest.uuid
index 3fb0d7415ac5edc9160fd4cfcdec2e84a2e266f5..c182cd8037b830d16b694543721d0fdfa3aaaaf3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9924c0456bfcd2058c9620a93dfbfd4c7d960c68910ce6aed7364dff42baba5c
\ No newline at end of file
+5865d2f2d0333024366ecf1d919535fd4ec05c637feff16d75028ccdc8db4b50
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 8208ce0856a27289981b4a779986c2c8a74dcb5d..9ed0dda7133509f680dda8b3681ca340250043be 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -4780,7 +4780,7 @@ struct ImportCtx {
 
 /* Clean up resourced used by an ImportCtx */
 static void import_cleanup(ImportCtx *p){
-  if( p->in!=0 &&& p->xCloser!=0 ){
+  if( p->in!=0 && p->xCloser!=0 ){
     p->xCloser(p->in);
     p->in = 0;
   }