From 8804de213060b29bf3ff0a5d9e5cc00e3ff112ce Mon Sep 17 00:00:00 2001 From: Maxim Prokhorov Date: Wed, 15 Mar 2023 12:45:08 +0300 Subject: [PATCH] utils: redundant implementation --- code/espurna/utils.cpp | 19 ++++++------------- code/espurna/utils.h | 3 +-- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/code/espurna/utils.cpp b/code/espurna/utils.cpp index 85c148c7..f9fcf548 100644 --- a/code/espurna/utils.cpp +++ b/code/espurna/utils.cpp @@ -222,29 +222,30 @@ espurna::StringView stripNewline(espurna::StringView value) { return value; } -bool isNumber(const char* begin, const char* end) { +bool isNumber(espurna::StringView view) { bool dot { false }; bool digit { false }; - for (auto ptr = begin; ptr != end; ++ptr) { + for (auto ptr = view.begin(); ptr != view.end(); ++ptr) { switch (*ptr) { - case '\0': - break; case '-': case '+': - if (ptr != begin) { + if (ptr != view.begin()) { return false; } break; + case '.': if (dot) { return false; } dot = true; break; + case '0' ... '9': digit = true; break; + case 'a' ... 'z': case 'A' ... 'Z': return false; @@ -254,14 +255,6 @@ bool isNumber(const char* begin, const char* end) { return digit; } -bool isNumber(const String& value) { - if (value.length()) { - return isNumber(value.begin(), value.end()); - } - - return false; -} - // ref: lwip2 lwip_strnstr with strnlen char* strnstr(const char* buffer, const char* token, size_t n) { const auto token_len = strnlen_P(token, n); diff --git a/code/espurna/utils.h b/code/espurna/utils.h index 8f658c81..6b009176 100644 --- a/code/espurna/utils.h +++ b/code/espurna/utils.h @@ -19,8 +19,7 @@ bool sslFingerPrintArray(const char * fingerprint, unsigned char * bytearray); bool sslFingerPrintChar(const char * fingerprint, char * destination); char* strnstr(const char* buffer, const char* token, size_t n); -bool isNumber(const char* begin, const char* end); -bool isNumber(const String&); +bool isNumber(espurna::StringView); double roundTo(double num, unsigned char positions); bool almostEqual(double lhs, double rhs, int ulp);