From: drh <drh@noemail.net>
Date: Fri, 5 Jan 2018 18:51:25 +0000 (+0000)
Subject: Fix a bug introduced by efforts to reduce compiler warnings in
X-Git-Tag: version-3.22.0~108^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fsqlar-shell-support;p=thirdparty%2Fsqlite.git

Fix a bug introduced by efforts to reduce compiler warnings in
check-in [364ac333b030f0]

FossilOrigin-Name: 1d6cee9ad448b10e69f351ef9dbec09110c5b189cba8734e637f41abe8f35bf8
---

diff --git a/ext/misc/fileio.c b/ext/misc/fileio.c
index 796bee399c..030b417e40 100644
--- a/ext/misc/fileio.c
+++ b/ext/misc/fileio.c
@@ -182,13 +182,14 @@ static int makeDirectory(
 
     while( rc==SQLITE_OK ){
       struct stat sStat;
+      int rc2;
 
       for(; zCopy[i]!='/' && i<nCopy; i++);
       if( i==nCopy ) break;
       zCopy[i] = '\0';
 
-      rc = stat(zCopy, &sStat);
-      if( rc!=0 ){
+      rc2 = stat(zCopy, &sStat);
+      if( rc2!=0 ){
         if( mkdir(zCopy, mode & 0777) ) rc = SQLITE_ERROR;
       }else{
         if( !S_ISDIR(sStat.st_mode) ) rc = SQLITE_ERROR;
diff --git a/manifest b/manifest
index 0c20fb2e6a..816bff3ecf 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sthe\sMakefile\sfor\sMSVC,\sthe\sdefault\starget\sshould\snot\sinclude\sbinaries\sthat\slink\sagainst\sthe\sTcl\slibrary.
-D 2018-01-05T17:40:38.949
+C Fix\sa\sbug\sintroduced\sby\sefforts\sto\sreduce\scompiler\swarnings\sin\ncheck-in\s[364ac333b030f0]
+D 2018-01-05T18:51:25.650
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in f5c6285ac43b2e567d6cf463dff3744da960a19f2cf141744b4472842a97681e
@@ -276,7 +276,7 @@ F ext/misc/compress.c 122faa92d25033d6c3f07c39231de074ab3d2e83
 F ext/misc/csv.c 1a009b93650732e22334edc92459c4630b9fa703397cbb3c8ca279921a36ca11
 F ext/misc/dbdump.c 3509fa6b8932d04e932d6b6b827b6a82ca362781b8e8f3c77336f416793e215e
 F ext/misc/eval.c f971962e92ebb8b0a4e6b62949463ee454d88fa2
-F ext/misc/fileio.c 1e3694706406fcca3a19d09dde9d01624f1d45f4b9e328f9adf61ffe568467ee
+F ext/misc/fileio.c f16e2ef87928b768883b259b6c53a67076e98e8daa0bbb624910406d59630b26
 F ext/misc/fuzzer.c 7c64b8197bb77b7d64eff7cac7848870235d4c25
 F ext/misc/ieee754.c f190d0cc5182529acb15babd177781be1ac1718c
 F ext/misc/json1.c dbe086615b9546c156bf32b9378fc09383b58bd17513b866cfd24c1e15281984
@@ -1694,7 +1694,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 bb650e5d14642b925c5ea65ba7991b35c4e941405d2557d542b99c66ca4bc130
-R cf861d2a1bc231834a93f636736946e1
-U mistachkin
-Z d9fbefa44671c9c82483590ecbf133ab
+P 5c6d0a1d58533feb4ea6926f4d3611664a275ad216492b424056276da38e84a2
+R ed8496ab8972efeecd73ab10aa079f0a
+U drh
+Z ab3dd049af31828f3cc751c8ec71ac20
diff --git a/manifest.uuid b/manifest.uuid
index a7d2b46577..7b97eab290 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5c6d0a1d58533feb4ea6926f4d3611664a275ad216492b424056276da38e84a2
\ No newline at end of file
+1d6cee9ad448b10e69f351ef9dbec09110c5b189cba8734e637f41abe8f35bf8
\ No newline at end of file