Remove a surplus semicolon, which was harmless on gcc and clang but caused

compile-time errors on msvc.  This only comes up using the encryption extension.

FossilOrigin-Name: 4510d55d1e2e23d4a4470dbd414161beec2ceefb7537fd66ea3c347e11624dfc

diff --git a/manifest b/manifest
index 612613fa23188d69aa09cebf9bee554854425fe0..8393756e241ec4ccdcb75aba226a9ef80e297787 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\sflattening\sa\squery,\smake\ssure\siTable\sattribute\sof\sTK_IF_NULL_ROW\noperators\s(that\sresult\sfrom\sa\sprior\sflattening\sof\sa\sLEFT\sJOIN)\sare\supdated\ncorrectly.\s\sFix\sfor\sticket\s[cad1ab4cb7b0fc344].
-D 2017-05-23T01:29:35.707
+C Remove\sa\ssurplus\ssemicolon,\swhich\swas\sharmless\son\sgcc\sand\sclang\sbut\scaused\ncompile-time\serrors\son\smsvc.\s\sThis\sonly\scomes\sup\susing\sthe\sencryption\sextension.
+D 2017-05-23T01:30:26.912
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc
@@ -368,7 +368,7 @@ F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c d4bb3a135948553d18cf992f76f7ed7b18aa0327f250607b5a6671e55d9947d5
 F src/legacy.c e88ed13c2d531decde75d42c2e35623fb9ce3cb0
 F src/loadext.c a72909474dadce771d3669bf84bf689424f6f87d471fee898589c3ef9b2acfd9
-F src/main.c 1e448d204045c1dcd604853639d9d8fe253aa9ec302a2f1ffd2e22752fd6b708
+F src/main.c a56577fa6407fb49650c1fd27bf828cd9b55126716b1f766a03c9c2cb42b43a0
 F src/malloc.c e20bb2b48abec52d3faf01cce12e8b4f95973755fafec98d45162dfdab111978
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@ -1580,8 +1580,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 28a94eb282822cad1d1420f2dad6bf65e4b8b9062eda4a0b9ee8270b2c608e40
-Q +92c178507df553e4f1110342c8f9b11b3ee37989e1d634fcaccabf657befa22f
-R 87760de0036b7383ba8bd44d827870b7
+P 919d36e6ea112c8c94f01e02611c48e78c441657e6898a466cfc39f1e0001403
+Q +987a2b5537254b1fe843eb798d7eb7f04dbe1e32fb827cfb9e1e1ef6c2096759
+R 77d7f81f7246ff3e88d2e4ea51671fac
 U drh
-Z 4c84216e1ffb8d423b12798f31db2c1a
+Z 937e7fff130b6fed55f87a69fd472b55

diff --git a/manifest.uuid b/manifest.uuid
index c0d82c41426aaeb169f44e0f5e8ca7c2291b0832..15ef7cbab7915abfddfa55d5979d07532230f30b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-919d36e6ea112c8c94f01e02611c48e78c441657e6898a466cfc39f1e0001403
\ No newline at end of file
+4510d55d1e2e23d4a4470dbd414161beec2ceefb7537fd66ea3c347e11624dfc
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 32d00087f5f6945dd6ef9e6fb04d8c35f73a81c5..1aa80d9496f7ae10cc25714765b01046585044b5 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -3096,7 +3096,7 @@ opendb_out:
 #if defined(SQLITE_HAS_CODEC)
   if( rc==SQLITE_OK ){
     const char *zKey;
-    if( (zKey = sqlite3_uri_parameter(zOpen, "hexkey"))!=0 && zKey[0] ){;
+    if( (zKey = sqlite3_uri_parameter(zOpen, "hexkey"))!=0 && zKey[0] ){
       u8 iByte;
       int i;
       char zDecoded[40];