Remove now unused legacy util functions

diff --git a/src/legacy_util.cpp b/src/legacy_util.cpp
index c1653c993442cd25e373a833c3824da2ddc5233d..6ee411852535af580988b5ce07cf8bba84118c15 100644 (file)
--- a/src/legacy_util.cpp
+++ b/src/legacy_util.cpp
@@ -342,36 +342,6 @@ x_strndup(const char* s, size_t n)
   return ret;
 }
 
-// This is like malloc() but dies if the malloc fails.
-void*
-x_malloc(size_t size)
-{
-  if (size == 0) {
-    // malloc() may return NULL if size is zero, so always do this to make sure
-    // that the code handles it regardless of platform.
-    return nullptr;
-  }
-  void* ret = malloc(size);
-  if (!ret) {
-    fatal("x_malloc: Could not allocate %lu bytes", (unsigned long)size);
-  }
-  return ret;
-}
-
-// This is like realloc() but dies if the malloc fails.
-void*
-x_realloc(void* ptr, size_t size)
-{
-  if (!ptr) {
-    return x_malloc(size);
-  }
-  void* p2 = realloc(ptr, size);
-  if (!p2) {
-    fatal("x_realloc: Could not allocate %lu bytes", (unsigned long)size);
-  }
-  return p2;
-}
-
 // This is like setenv.
 void
 x_setenv(const char* name, const char* value)
@@ -414,29 +384,6 @@ reformat(char** ptr, const char* format, ...)
   }
 }
 
-// Return the dir name of a file - caller frees.
-char*
-x_dirname(const char* path)
-{
-  char* s = x_strdup(path);
-  char* p = strrchr(s, '/');
-#ifdef _WIN32
-  char* p2 = strrchr(s, '\\');
-  if (!p || (p2 && p < p2)) {
-    p = p2;
-  }
-#endif
-  if (!p) {
-    free(s);
-    s = x_strdup(".");
-  } else if (p == s) {
-    *(p + 1) = 0;
-  } else {
-    *p = 0;
-  }
-  return s;
-}
-
 // Format a size as a human-readable string. Caller frees.
 char*
 format_human_readable_size(uint64_t size)
@@ -675,70 +622,6 @@ x_rename(const char* oldpath, const char* newpath)
 #endif
 }
 
-// Reads the content of a file. Size hint 0 means no hint. Returns true on
-// success, otherwise false.
-bool
-read_file(const char* path, size_t size_hint, char** data, size_t* size)
-{
-  if (size_hint == 0) {
-    size_hint = Stat::stat(path, Stat::OnError::log).size();
-  }
-  // +1 to be able to detect EOF in the first read call
-  size_hint = (size_hint < 1024) ? 1024 : size_hint + 1;
-
-  Fd fd(open(path, O_RDONLY | O_BINARY));
-  if (!fd) {
-    return false;
-  }
-  size_t allocated = size_hint;
-  *data = static_cast<char*>(x_malloc(allocated));
-  ssize_t ret;
-  size_t pos = 0;
-  while (true) {
-    if (pos > allocated / 2) {
-      allocated *= 2;
-      *data = static_cast<char*>(x_realloc(*data, allocated));
-    }
-    const size_t max_read = allocated - pos;
-    ret = read(*fd, *data + pos, max_read);
-    if (ret == 0 || (ret == -1 && errno != EINTR)) {
-      break;
-    }
-    if (ret > 0) {
-      pos += ret;
-      if (static_cast<size_t>(ret) < max_read) {
-        break;
-      }
-    }
-  }
-
-  if (ret == -1) {
-    cc_log("Failed reading %s", path);
-    free(*data);
-    *data = nullptr;
-    return false;
-  }
-
-  *size = pos;
-  return true;
-}
-
-// Return the content (with NUL termination) of a text file, or NULL on error.
-// Caller frees. Size hint 0 means no hint.
-char*
-read_text_file(const char* path, size_t size_hint)
-{
-  size_t size;
-  char* data;
-  if (read_file(path, size_hint, &data, &size)) {
-    data = static_cast<char*>(x_realloc(data, size + 1));
-    data[size] = '\0';
-    return data;
-  } else {
-    return nullptr;
-  }
-}
-
 static bool
 expand_variable(const char** str, char** result, char** errmsg)
 {

diff --git a/src/legacy_util.hpp b/src/legacy_util.hpp
index 329a1bb9b2c4dd8ecef140549fe598d160692890..5d3f35a6f33a8830b0ec160db2c3c783edf0f71c 100644 (file)
--- a/src/legacy_util.hpp
+++ b/src/legacy_util.hpp
@@ -35,11 +35,8 @@ char* format(const char* format, ...) ATTR_FORMAT(printf, 1, 2);
 void reformat(char** ptr, const char* format, ...) ATTR_FORMAT(printf, 2, 3);
 char* x_strdup(const char* s);
 char* x_strndup(const char* s, size_t n);
-void* x_malloc(size_t size);
-void* x_realloc(void* ptr, size_t size);
 void x_setenv(const char* name, const char* value);
 void x_unsetenv(const char* name);
-char* x_dirname(const char* path);
 char* format_human_readable_size(uint64_t size);
 char* format_parsable_size_with_suffix(uint64_t size);
 bool parse_size_with_suffix(const char* str, uint64_t* size);
@@ -54,8 +51,6 @@ bool is_full_path(const char* path);
 void update_mtime(const char* path);
 void x_exit(int status) ATTR_NORETURN;
 int x_rename(const char* oldpath, const char* newpath);
-bool read_file(const char* path, size_t size_hint, char** data, size_t* size);
-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();

diff --git a/unittest/test_legacy_util.cpp b/unittest/test_legacy_util.cpp
index e909e73d8b7ab24a9d1ba732c979f0142fa9f302..f20b0668873138d5f515d03f12d51dc1a43cf2ba 100644 (file)
--- a/unittest/test_legacy_util.cpp
+++ b/unittest/test_legacy_util.cpp
@@ -28,17 +28,6 @@
 
 TEST_SUITE_BEGIN("legacy_util");
 
-TEST_CASE("x_dirname")
-{
-  CHECK_STR_EQ_FREE2(".", x_dirname("foo.c"));
-  CHECK_STR_EQ_FREE2(".", x_dirname(""));
-  CHECK_STR_EQ_FREE2("/", x_dirname("/"));
-  CHECK_STR_EQ_FREE2("/", x_dirname("/foo.c"));
-  CHECK_STR_EQ_FREE2("dir1/dir2", x_dirname("dir1/dir2/foo.c"));
-  CHECK_STR_EQ_FREE2("/dir", x_dirname("/dir/foo.c"));
-  CHECK_STR_EQ_FREE2("dir1/dir2", x_dirname("dir1/dir2/"));
-}
-
 TEST_CASE("subst_env_in_string")
 {
   char* errmsg;