From: mistachkin <mistachkin@noemail.net>
Date: Mon, 17 Dec 2018 22:19:57 +0000 (+0000)
Subject: Move variable declaration to address compilation issue (C89).
X-Git-Tag: version-3.27.0~283
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=99490934aeac3111eb3043865d986d90d560ac71;p=thirdparty%2Fsqlite.git

Move variable declaration to address compilation issue (C89).

FossilOrigin-Name: d64f248da3ce7762fe2c17fbc83f7bea9ffca73723bb3ad0982a85320839da90
---

diff --git a/manifest b/manifest
index 8be2a97978..802001e508 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\serrors\sin\scomments\sin\sfts5.h.
-D 2018-12-15T07:12:34.293
+C Move\svariable\sdeclaration\sto\saddress\scompilation\sissue\s(C89).
+D 2018-12-17T22:19:57.272
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in d8b254f8bb81bab43c340d70d17dc3babab40fcc8a348c8255881f780a45fee6
@@ -508,7 +508,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 72fe8cae7326b979e7258ab4c531956951e1a5f3fe8644c646abaec1b2eb6d95
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c 8c7317d5ee920516a56b8b4ca79fbfca70a1f8b52d67e884c808ea3a016c04e3
-F src/shell.c.in e1790e0d3607fca70ce61e5a0c83885d82f33ebe362edfb1cb66342d12c182d0
+F src/shell.c.in 207da30342db0b6fac8b2487abd60b059a5ea80cc9494bd1db76a1dd4aae7cca
 F src/sqlite.h.in 92fd656c26cc76de9fa8c5bf1a473066e3b5c6da345a447679f0f44de1aa4edd
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 960f1b86c3610fa23cb6a267572a97dcf286e77aa0dd3b9b23292ffaa1ea8683
@@ -1787,7 +1787,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 27221c69901d2b4546167639c4a3c8f54b2e18820f1346870fa26b7c919027db
-R 9df18efb766b99d5781ecbcd31fe60d1
-U dan
-Z ca390272dfac9ef22cff2bc723aefc3c
+P 4002790d9418289f3e090c694f651a89d8f523119c8ce2f396999b0387148241
+R f6fe710e431b4ec745a10d3cc1fd8bbd
+U mistachkin
+Z 6a337bb039fd5a5fb74a7787d4378ec4
diff --git a/manifest.uuid b/manifest.uuid
index 2b06fe416d..703a1535de 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4002790d9418289f3e090c694f651a89d8f523119c8ce2f396999b0387148241
\ No newline at end of file
+d64f248da3ce7762fe2c17fbc83f7bea9ffca73723bb3ad0982a85320839da90
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index 6bb8ee7fdc..7048732389 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -3905,6 +3905,7 @@ static void open_db(ShellState *p, int openFlags){
 #ifdef SQLITE_ENABLE_DESERIALIZE
     else
     if( p->openMode==SHELL_OPEN_DESERIALIZE || p->openMode==SHELL_OPEN_HEXDB ){
+      int rc;
       int nData = 0;
       unsigned char *aData;
       if( p->openMode==SHELL_OPEN_DESERIALIZE ){
@@ -3916,7 +3917,7 @@ static void open_db(ShellState *p, int openFlags){
           return;
         }
       }
-      int rc = sqlite3_deserialize(p->db, "main", aData, nData, nData,
+      rc = sqlite3_deserialize(p->db, "main", aData, nData, nData,
                    SQLITE_DESERIALIZE_RESIZEABLE |
                    SQLITE_DESERIALIZE_FREEONCLOSE);
       if( rc ){