From 1bc1c04955ba282e5ea0e2230c2168202518e643 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 11 Nov 2020 14:05:31 +0200 Subject: [PATCH] use exclusive branches in QFSFileEngine::extension() Signed-off-by: Ivailo Monev --- src/core/io/qfsfileengine.cpp | 3 +-- src/core/io/qfsfileengine_unix.cpp | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/core/io/qfsfileengine.cpp b/src/core/io/qfsfileengine.cpp index 9f169336e..9ee4fe41e 100644 --- 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(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 a16785931..4604de508 100644 --- 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(mapAddress); maps[address] = QPair(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; } -- 2.11.0