use exclusive branches in QFSFileEngine::extension()

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/core/io/qfsfileengine.cpp b/src/core/io/qfsfileengine.cpp
index 9f16933..9ee4fe4 100644 (file)
--- a/src/core/io/qfsfileengine.cpp
+++ b/src/core/io/qfsfileengine.cpp
@@ -485,8 +485,7 @@ bool QFSFileEngine::extension(Extension extension, const ExtensionOption *option
         MapExtensionReturn *returnValue = static_cast<MapExtensionReturn*>(output);
         returnValue->address = d->map(options->offset, options->size);
         return (returnValue->address != 0);
-    }
-    if (extension == UnMapExtension) {
+    } else if (extension == UnMapExtension) {
         UnMapExtensionOption *options = (UnMapExtensionOption*)option;
         return d->unmap(options->address);
     }

diff --git a/src/core/io/qfsfileengine_unix.cpp b/src/core/io/qfsfileengine_unix.cpp
index a167859..4604de5 100644 (file)
--- a/src/core/io/qfsfileengine_unix.cpp
+++ b/src/core/io/qfsfileengine_unix.cpp
@@ -351,7 +351,7 @@ uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size)
 
     void *mapAddress = QT_MMAP(Q_NULLPTR, realSize,
                    access, MAP_SHARED, fd, realOffset);
-    if (MAP_FAILED != mapAddress) {
+    if (mapAddress != MAP_FAILED) {
         uchar *address = extra + static_cast<uchar*>(mapAddress);
         maps[address] = QPair<int,size_t>(extra, realSize);
         return address;
@@ -384,7 +384,7 @@ bool QFSFileEnginePrivate::unmap(uchar *ptr)
 
     uchar *start = ptr - maps[ptr].first;
     size_t len = maps[ptr].second;
-    if (-1 == munmap(start, len)) {
+    if (::munmap(start, len) == -1) {
         q->setError(QFile::UnspecifiedError, qt_error_string(errno));
         return false;
     }