From: drh <drh@noemail.net>
Date: Fri, 9 Mar 2018 12:46:34 +0000 (+0000)
Subject: Attempt to fix a harmless compiler warning from Clang.
X-Git-Tag: version-3.23.0~74
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=980e2cd39a950521a62fb1017825db3e035e7230;p=thirdparty%2Fsqlite.git

Attempt to fix a harmless compiler warning from Clang.

FossilOrigin-Name: bba1bfbde62733e14f458bf3b71cb00d4899a4ebae2553d6ed24d48495cdced1
---

diff --git a/ext/misc/zipfile.c b/ext/misc/zipfile.c
index a400ae30e1..245dfefd39 100644
--- a/ext/misc/zipfile.c
+++ b/ext/misc/zipfile.c
@@ -1400,7 +1400,7 @@ static int zipfileGetMode(
       else if( z[i]!='-' ) goto parse_error;
     }
   }
-  if( (bIsDir == ((mode & S_IFDIR)==0)) ){
+  if( ((mode & S_IFDIR)==0)==bIsDir ){
     /* The "mode" attribute is a directory, but data has been specified.
     ** Or vice-versa - no data but "mode" is a file or symlink.  */
     return SQLITE_CONSTRAINT;
diff --git a/manifest b/manifest
index a9e54d2b23..16434f9274 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enable\sAPI\sarmor\shandling\sfor\sthe\snew\sdeserialize\sAPIs.
-D 2018-03-08T19:56:52.999
+C Attempt\sto\sfix\sa\sharmless\scompiler\swarning\sfrom\sClang.
+D 2018-03-09T12:46:34.612
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
@@ -304,7 +304,7 @@ F ext/misc/vfsstat.c bf10ef0bc51e1ad6756629e1edb142f7a8db1178
 F ext/misc/vtablog.c 31d0d8f4406795679dcd3a67917c213d3a2a5fb3ea5de35f6e773491ed7e13c9
 F ext/misc/vtshim.c 1976e6dd68dd0d64508c91a6dfab8e75f8aaf6cd
 F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212
-F ext/misc/zipfile.c bc88dbf9aa26c24595d158c1398208786ef34e7aee19ea29e8f0110c752fca03
+F ext/misc/zipfile.c b326d0e789daf41faa9641609143c5be4aa5b76b7919955085f8d95359316251
 F ext/misc/zorder.c b0ff58fa643afa1d846786d51ea8d5c4b6b35aa0254ab5a82617db92f3adda64
 F ext/rbu/rbu.c ea7d1b7eb44c123a2a619332e19fe5313500705c4a58aaa1887905c0d83ffc2e
 F ext/rbu/rbu1.test 43836fac8c7179a358eaf38a8a1ef3d6e6285842
@@ -1712,7 +1712,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 f010c86ecef4a1aaad986fa8ceb8230814d6c909cc28ce19e55d63f592fee9d0
-R 2cf64c7279465827e47c06ffb1b6ff5e
-U mistachkin
-Z 6649db53fbf91dfe5807c11f88365132
+P 0798c91aa9d5d347680a9d80d420224297360e03341365d48aca829cd7c423db
+R a4a63f736128503f57643dafdbf79b24
+U drh
+Z be320216d4ac5b5f28d3cdb731b32cdb
diff --git a/manifest.uuid b/manifest.uuid
index 1ddf00bf2d..c262f42ab3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0798c91aa9d5d347680a9d80d420224297360e03341365d48aca829cd7c423db
\ No newline at end of file
+bba1bfbde62733e14f458bf3b71cb00d4899a4ebae2553d6ed24d48495cdced1
\ No newline at end of file