From: Joel Rosdahl <joel@rosdahl.net>
Date: Fri, 8 May 2020 18:03:25 +0000 (+0200)
Subject: Remove now obsolete from_cstr function
X-Git-Tag: v4.0~472
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dbd11f2ca9de18d87b5b25feb79d414bed637b8b;p=thirdparty%2Fccache.git

Remove now obsolete from_cstr function
---

diff --git a/src/legacy_util.cpp b/src/legacy_util.cpp
index 4208ed970..34e58eea2 100644
--- a/src/legacy_util.cpp
+++ b/src/legacy_util.cpp
@@ -1009,9 +1009,3 @@ time_seconds()
   return (double)time(NULL);
 #endif
 }
-
-std::string
-from_cstr(const char* str)
-{
-  return str ? str : std::string{};
-}
diff --git a/src/legacy_util.hpp b/src/legacy_util.hpp
index 782c77bf9..a7fb3ae71 100644
--- a/src/legacy_util.hpp
+++ b/src/legacy_util.hpp
@@ -64,6 +64,3 @@ char* read_text_file(const char* path, size_t size_hint);
 char* subst_env_in_string(const char* str, char** errmsg);
 void set_cloexec_flag(int fd);
 double time_seconds();
-
-// Convert a char* string `str` to an std::string, if `str` is NULL return "".
-std::string from_cstr(const char* str);
diff --git a/unittest/test_legacy_util.cpp b/unittest/test_legacy_util.cpp
index 3ddde80f1..b25a839dd 100644
--- a/unittest/test_legacy_util.cpp
+++ b/unittest/test_legacy_util.cpp
@@ -149,24 +149,4 @@ TEST(format_hex)
   CHECK_STR_EQ("00010203", result);
 }
 
-TEST(from_cstr)
-{
-  char* cstr1 = x_strdup("foo");
-  const char* cstr2 = "bar";
-  const char* cstr3 = nullptr;
-  const char* cstr4 = "";
-
-  std::string str1 = from_cstr(cstr1);
-  std::string str2 = from_cstr(cstr2);
-  std::string str3 = from_cstr(cstr3);
-  std::string str4 = from_cstr(cstr4);
-
-  CHECK(str1 == "foo");
-  CHECK(str2 == "bar");
-  CHECK(str3 == "");
-  CHECK(str4 == "");
-
-  free(cstr1);
-}
-
 TEST_SUITE_END