From 8a6f08ae739762a448413785547e196e9756a923 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 23 Oct 2021 17:58:20 -0500 Subject: [PATCH] [ox/std] Update strops nodiscard use to match current style --- deps/ox/src/ox/std/strops.hpp | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/deps/ox/src/ox/std/strops.hpp b/deps/ox/src/ox/std/strops.hpp index 02c97c44..de964a73 100644 --- a/deps/ox/src/ox/std/strops.hpp +++ b/deps/ox/src/ox/std/strops.hpp @@ -37,21 +37,24 @@ constexpr char *ox_strncpy(T1 dest, T2 src, std::size_t maxLen) noexcept { return dest; } -[[nodiscard]] constexpr auto ox_strnlen(const char *str1, std::size_t maxLen) noexcept { +[[nodiscard]] +constexpr auto ox_strnlen(const char *str1, std::size_t maxLen) noexcept { std::size_t len = 0; for (; len < maxLen && str1[len]; len++); return len; } template -[[nodiscard]] constexpr auto ox_strlen(T str1) noexcept { +[[nodiscard]] +constexpr auto ox_strlen(T str1) noexcept { std::size_t len = 0; for (; str1[len]; len++); return len; } template -[[nodiscard]] constexpr int ox_strcmp(T1 str1, T2 str2) noexcept { +[[nodiscard]] +constexpr int ox_strcmp(T1 str1, T2 str2) noexcept { auto retval = 0; auto i = 0; while (str1[i] || str2[i]) { @@ -68,7 +71,8 @@ template } template -[[nodiscard]] constexpr int ox_strncmp(T1 str1, T2 str2, const std::size_t maxLen) noexcept { +[[nodiscard]] +constexpr int ox_strncmp(T1 str1, T2 str2, const std::size_t maxLen) noexcept { auto retval = 0; std::size_t i = 0; while (i < maxLen && (str1[i] || str2[i])) { @@ -84,7 +88,8 @@ template return retval; } -[[nodiscard]] constexpr const char *ox_strchr(const char *str, int character, std::size_t maxLen = 0xFFFFFFFF) noexcept { +[[nodiscard]] +constexpr const char *ox_strchr(const char *str, int character, std::size_t maxLen = 0xFFFFFFFF) noexcept { for (std::size_t i = 0; i <= maxLen; i++) { if (str[i] == character) { return &str[i]; @@ -95,7 +100,8 @@ template return nullptr; } -[[nodiscard]] constexpr char *ox_strchr(char *str, int character, std::size_t maxLen = 0xFFFFFFFF) noexcept { +[[nodiscard]] +constexpr char *ox_strchr(char *str, int character, std::size_t maxLen = 0xFFFFFFFF) noexcept { for (std::size_t i = 0; i < maxLen; i++) { if (str[i] == character) { return &str[i]; @@ -106,7 +112,8 @@ template return nullptr; } -[[nodiscard]] constexpr int ox_lastIndexOf(const char *str, int character, std::size_t maxLen = 0xFFFFFFFF) noexcept { +[[nodiscard]] +constexpr int ox_lastIndexOf(const char *str, int character, std::size_t maxLen = 0xFFFFFFFF) noexcept { int retval = -1; for (std::size_t i = 0; i < maxLen && str[i]; i++) { if (str[i] == character) { @@ -116,7 +123,8 @@ template return retval; } -[[nodiscard]] constexpr int ox_lastIndexOf(char *str, int character, std::size_t maxLen = 0xFFFFFFFF) noexcept { +[[nodiscard]] +constexpr int ox_lastIndexOf(char *str, int character, std::size_t maxLen = 0xFFFFFFFF) noexcept { int retval = -1; for (std::size_t i = 0; i < maxLen && str[i]; i++) { if (str[i] == character) {