Remove now obsolete from_cstr function

diff --git a/src/legacy_util.cpp b/src/legacy_util.cpp
index 4208ed9708702b260f0ee3b46973d86bcf409efe..34e58eea22af1fc53b1cdf422d1426baaf726953 100644 (file)
--- 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 782c77bf92c3d65428d3f696c21c989fb43061fc..a7fb3ae71f554bf9d9acbbbf4fd6a9ba84acbf88 100644 (file)
--- 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 3ddde80f1b49abeba514676e5c76dc403f1cae82..b25a839dda837425fe0e2a7eb912ccaebc532001 100644 (file)
--- 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