Remove legacy strtok_r()

diff --git a/configure.ac b/configure.ac
index 1b2bf291927e630e84bd1ba04a6a93ff7270fcb6..f5baba3945f57f907c43ba342f8e96d95f48fb43 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -129,7 +129,6 @@ AC_CHECK_FUNCS(mkstemp)
 AC_CHECK_FUNCS(realpath)
 AC_CHECK_FUNCS(setenv)
 AC_CHECK_FUNCS(strndup)
-AC_CHECK_FUNCS(strtok_r)
 AC_CHECK_FUNCS(syslog)
 AC_CHECK_FUNCS(unsetenv)
 AC_CHECK_FUNCS(utimes)

diff --git a/src/legacy_util.cpp b/src/legacy_util.cpp
index fc9134c206f82d13d43c0cf5f585918302d0f086..4208ed9708702b260f0ee3b46973d86bcf409efe 100644 (file)
--- a/src/legacy_util.cpp
+++ b/src/legacy_util.cpp
@@ -612,30 +612,6 @@ localtime_r(const time_t* timep, struct tm* result)
 }
 #endif
 
-#ifndef HAVE_STRTOK_R
-// strtok_r replacement.
-char*
-strtok_r(char* str, const char* delim, char** saveptr)
-{
-  if (!str) {
-    str = *saveptr;
-  }
-  int len = strlen(str);
-  char* ret = strtok(str, delim);
-  if (ret) {
-    char* save = ret;
-    while (*save++) {
-      // Do nothing.
-    }
-    if ((len + 1) == (intptr_t)(save - str)) {
-      save--;
-    }
-    *saveptr = save;
-  }
-  return ret;
-}
-#endif
-
 // Create an empty temporary file. *fname will be reallocated and set to the
 // resulting filename. Returns an open file descriptor to the file.
 int

diff --git a/src/legacy_util.hpp b/src/legacy_util.hpp
index bb3ccb13d172db4c24eba26d228443e84294616b..782c77bf92c3d65428d3f696c21c989fb43061fc 100644 (file)
--- a/src/legacy_util.hpp
+++ b/src/legacy_util.hpp
@@ -48,9 +48,6 @@ bool parse_size_with_suffix(const char* str, uint64_t* size);
 #ifndef HAVE_LOCALTIME_R
 struct tm* localtime_r(const time_t* timep, struct tm* result);
 #endif
-#ifndef HAVE_STRTOK_R
-char* strtok_r(char* str, const char* delim, char** saveptr);
-#endif
 int create_tmp_fd(char** fname);
 FILE* create_tmp_file(char** fname, const char* mode);
 const char* get_home_directory();