From e497df64de9a7e9d4b9073578c84576b4b027774 Mon Sep 17 00:00:00 2001 From: Murai Takashi Date: Tue, 27 Oct 2020 19:43:48 +0900 Subject: [PATCH] file_systems/userlandfs: Fix -Wnonnull-compare In String::SetTo(), strnlen() is called only when *str is not NULL. This leads to "-Wnonnull-compare" warning at line 12. So, use system's strnlen() to fix warning. Change-Id: I55098af4e2c62ebcf3b6105b7b8f186eebf28edf Reviewed-on: https://review.haiku-os.org/c/haiku/+/3363 Reviewed-by: Adrien Destugues --- .../file_systems/userlandfs/shared/String.cpp | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/add-ons/kernel/file_systems/userlandfs/shared/String.cpp b/src/add-ons/kernel/file_systems/userlandfs/shared/String.cpp index 414d58591d..e0c8466724 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/shared/String.cpp +++ b/src/add-ons/kernel/file_systems/userlandfs/shared/String.cpp @@ -5,22 +5,6 @@ #include "String.h" -// strnlen -size_t -strnlen(const char *str, size_t maxLen) -{ - if (str) { - size_t origMaxLen = maxLen; - while (maxLen > 0 && *str != '\0') { - maxLen--; - str++; - } - return origMaxLen - maxLen; - } - return 0; -} - - /*! \class String \brief A very simple string class.