Drop xbt_str_split().

diff --git a/ChangeLog b/ChangeLog
index b4aa5e1..304fb93 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,6 +51,9 @@ SMPI:
    building shared libraries, this may cause issues, so environment variable
    SMPI_NO_UNDEFINED_CHECK can be added to disable this.
 
+XBT:
+ - Drop xbt_str_split().
+
 C binding and interface:
  - The return type of the sg_actor_on_exit() callbacks is now 'void'
    (int value was previously ignored)

diff --git a/include/xbt/str.h b/include/xbt/str.h
index d0bc0a6..1d57af0 100644 (file)
--- a/include/xbt/str.h
+++ b/include/xbt/str.h
@@ -24,7 +24,6 @@ SG_BEGIN_DECL
  * @{
  */
 
-XBT_PUBLIC xbt_dynar_t xbt_str_split(const char* s, const char* sep);
 XBT_PUBLIC xbt_dynar_t xbt_str_split_quoted(const char* s);
 XBT_PUBLIC xbt_dynar_t xbt_str_split_quoted_in_place(char* s);
 

diff --git a/src/xbt/xbt_str.cpp b/src/xbt/xbt_str.cpp
index 78a21c5..c398e3c 100644 (file)
--- a/src/xbt/xbt_str.cpp
+++ b/src/xbt/xbt_str.cpp
@@ -11,63 +11,6 @@
 #include "xbt/string.hpp"
 #include <array>
 
-/** @brief Splits a string into a dynar of strings
- *
- * @param s: the string to split
- * @param sep: a string of all chars to consider as separator.
- *
- * By default (with sep=nullptr), these characters are used as separator:
- *
- *  - " "    (ASCII 32  (0x20))  space.
- *  - "\t"    (ASCII 9  (0x09))  tab.
- *  - "\n"    (ASCII 10  (0x0A))  line feed.
- *  - "\r"    (ASCII 13  (0x0D))  carriage return.
- *  - "\0"    (ASCII 0  (0x00))  nullptr.
- *  - "\x0B"  (ASCII 11  (0x0B))  vertical tab.
- */
-xbt_dynar_t xbt_str_split(const char *s, const char *sep)
-{
-  xbt_dynar_t res = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
-  const char *sep_dflt = " \t\n\r\x0B";
-  std::array<bool, 256> is_sep;
-
-  /* check what are the separators */
-  is_sep.fill(false);
-  if (not sep) {
-    while (*sep_dflt)
-      is_sep[(unsigned char)*sep_dflt++] = true;
-  } else {
-    while (*sep)
-      is_sep[(unsigned char)*sep++] = true;
-  }
-  is_sep[0] = true; /* End of string is also separator */
-
-  /* Do the job */
-  const char* p = s;
-  const char* q = s;
-  int done      = 0;
-
-  if (s[0] == '\0')
-    return res;
-
-  while (not done) {
-    char *topush;
-    while (not is_sep[(unsigned char)*q]) {
-      q++;
-    }
-    if (*q == '\0')
-      done = 1;
-
-    topush = (char*) xbt_malloc(q - p + 1);
-    memcpy(topush, p, q - p);
-    topush[q - p] = '\0';
-    xbt_dynar_push(res, &topush);
-    p = ++q;
-  }
-
-  return res;
-}
-
 /** @brief Just like @ref xbt_str_split_quoted (Splits a string into a dynar of strings), but without memory allocation
  *
  * The string passed as argument must be writable (not const)