From dd5fc20e902187356538d1c993d9ece729f6f505 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 27 Aug 2021 16:01:06 +0200 Subject: [PATCH] Minor clean-ups noticed during string-parsing improvements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Simplify a conditional to save some repetition, purge some spurious parentheses. Change-Id: I727d22ce81733e765c4ee951475ccdb599063399 Reviewed-by: Mårten Nordheim --- src/corelib/io/qipaddress.cpp | 6 ++---- src/corelib/tools/qversionnumber.cpp | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/corelib/io/qipaddress.cpp b/src/corelib/io/qipaddress.cpp index 93a74ccd098..911d1a54b94 100644 --- a/src/corelib/io/qipaddress.cpp +++ b/src/corelib/io/qipaddress.cpp @@ -115,10 +115,8 @@ static bool parseIp4Internal(IPv4Address &address, const char *ptr, bool acceptL } address |= x; - if (dotCount == 3 && *endptr != '\0') - return false; - else if (dotCount == 3 || *endptr == '\0') - return true; + if (dotCount == 3 || *endptr == '\0') + return *endptr == '\0'; if (*endptr != '.') return false; diff --git a/src/corelib/tools/qversionnumber.cpp b/src/corelib/tools/qversionnumber.cpp index 1d05fdd89c0..466a8cc64e8 100644 --- a/src/corelib/tools/qversionnumber.cpp +++ b/src/corelib/tools/qversionnumber.cpp @@ -452,7 +452,7 @@ static QVersionNumber from_string(QLatin1String string, qsizetype *suffixIndex) seg.append(int(value)); start = end + 1; lastGoodEnd = end; - } while (start < endOfString && (end < endOfString && *end == '.')); + } while (start < endOfString && end < endOfString && *end == '.'); if (suffixIndex) *suffixIndex = lastGoodEnd - string.begin();