From 26105471379290d5f73da805bae958e621a90e12 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 14 Dec 2023 14:28:46 +0100 Subject: [PATCH] Cleanup Signed-off-by: Simon Rozman --- UnitTests/parser.cpp | 2 +- UnitTests/sgml.cpp | 18 +++++++++--------- include/stdex/compat.hpp | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/UnitTests/parser.cpp b/UnitTests/parser.cpp index 49e8bb80b..9d9c6c639 100644 --- a/UnitTests/parser.cpp +++ b/UnitTests/parser.cpp @@ -457,7 +457,7 @@ namespace UnitTests Assert::AreEqual((size_t)15, hdrs.size()); http_weighted_collection> langs; for (const auto& h : hdrs) - if (strnicmp(request + h.name.start, h.name.size(), "Accept-Language", (size_t)-1, locale) == 0) + if (strnicmp(request + h.name.start, h.name.size(), "Accept-Language", SIZE_MAX, locale) == 0) langs.insert(request, h.value.start, h.value.end); Assert::IsTrue(!langs.empty()); { diff --git a/UnitTests/sgml.cpp b/UnitTests/sgml.cpp index ade44e926..5a9e10ffd 100644 --- a/UnitTests/sgml.cpp +++ b/UnitTests/sgml.cpp @@ -17,17 +17,17 @@ namespace UnitTests public: TEST_METHOD(sgml2str) { - Assert::AreEqual(L"This is a test.", stdex::sgml2str("This is a test.", (size_t)-1).c_str()); - Assert::AreEqual(L"Th\u00ed\u0161 i\u22c5 a te\u0073\u0304t.&unknown;😀😅", stdex::sgml2str("Thíš i⋅ a te&smacr;t.&unknown;😀😅", (size_t)-1).c_str()); + Assert::AreEqual(L"This is a test.", stdex::sgml2str("This is a test.", SIZE_MAX).c_str()); + Assert::AreEqual(L"Th\u00ed\u0161 i\u22c5 a te\u0073\u0304t.&unknown;😀😅", stdex::sgml2str("Thíš i⋅ a te&smacr;t.&unknown;😀😅", SIZE_MAX).c_str()); Assert::AreEqual(L"This", stdex::sgml2str("This is a test.", 4).c_str()); Assert::AreEqual(L"T\u0068\u0301", stdex::sgml2str("T&hacute;is is a test.", 9).c_str()); Assert::AreEqual(L"T&hac", stdex::sgml2str("T&hacute;is is a test.", 5).c_str()); - Assert::AreEqual(L"The "quoted" & text.", stdex::sgml2str("The "quoted" & text.", (size_t)-1, stdex::sgml_c).c_str()); + Assert::AreEqual(L"The "quoted" & text.", stdex::sgml2str("The "quoted" & text.", SIZE_MAX, stdex::sgml_c).c_str()); stdex::mapping_vector map; constexpr size_t i = 0; constexpr size_t j = 0; - stdex::sgml2str("Thíš i⋅ a te&smacr;t.&unknown;😀😅", (size_t)-1, 0, stdex::mapping(i, j), &map); + stdex::sgml2str("Thíš i⋅ a te&smacr;t.&unknown;😀😅", SIZE_MAX, 0, stdex::mapping(i, j), &map); Assert::IsTrue(stdex::mapping_vector{ { i + 2, j + 2 }, { i + 10, j + 3 }, @@ -54,14 +54,14 @@ namespace UnitTests TEST_METHOD(str2sgml) { - Assert::AreEqual("This is a test.", stdex::str2sgml(L"This is a test.", (size_t)-1).c_str()); - Assert::AreEqual("Thíš i⋅ a te&smacr;t.&unknown;😀😅", stdex::str2sgml(L"Th\u00ed\u0161 i\u22c5 a te\u0073\u0304t.&unknown;😀😅", (size_t)-1).c_str()); + Assert::AreEqual("This is a test.", stdex::str2sgml(L"This is a test.", SIZE_MAX).c_str()); + Assert::AreEqual("Thíš i⋅ a te&smacr;t.&unknown;😀😅", stdex::str2sgml(L"Th\u00ed\u0161 i\u22c5 a te\u0073\u0304t.&unknown;😀😅", SIZE_MAX).c_str()); Assert::AreEqual("This", stdex::str2sgml(L"This is a test.", 4, 0).c_str()); Assert::AreEqual("te&smacr;", stdex::str2sgml(L"te\u0073\u0304t", 4, 0).c_str()); Assert::AreEqual("tes", stdex::str2sgml(L"te\u0073\u0304t", 3, 0).c_str()); - Assert::AreEqual("⌘‰͢", stdex::str2sgml(L"⌘‰͢", (size_t)-1).c_str()); - Assert::AreEqual("$\"<>&", stdex::str2sgml(L"$\"<>&", (size_t)-1).c_str()); - Assert::AreEqual("$"<>&", stdex::str2sgml(L"$\"<>&", (size_t)-1, stdex::sgml_c).c_str()); + Assert::AreEqual("⌘‰͢", stdex::str2sgml(L"⌘‰͢", SIZE_MAX).c_str()); + Assert::AreEqual("$\"<>&", stdex::str2sgml(L"$\"<>&", SIZE_MAX).c_str()); + Assert::AreEqual("$"<>&", stdex::str2sgml(L"$\"<>&", SIZE_MAX, stdex::sgml_c).c_str()); } }; } diff --git a/include/stdex/compat.hpp b/include/stdex/compat.hpp index 939d7349d..e134a7158 100644 --- a/include/stdex/compat.hpp +++ b/include/stdex/compat.hpp @@ -186,7 +186,7 @@ #ifndef _WIN32 template -size_t _countof(T (&arr)[N]) +size_t _countof(const T (&arr)[N]) { return std::extent::value; }