Remove now unused xbt_str_join_array().

diff --git a/ChangeLog b/ChangeLog
index 9d91f72..d9056c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -58,6 +58,7 @@ XBT:
    -fsplit-stack is the way to go nowadays when using threads.
  - Drop the xbt_os_thread_t module (now unused)
  - Drop xbt_ex_display(), use simgrid::xbt::log_exception() instead.
    -fsplit-stack is the way to go nowadays when using threads.
  - Drop the xbt_os_thread_t module (now unused)
  - Drop xbt_ex_display(), use simgrid::xbt::log_exception() instead.

+ - Drop xbt_str_join_array().

  - Drop cunit, use Catch2 instead.
 
 Kernel:
  - Drop cunit, use Catch2 instead.
 
 Kernel:

diff --git a/include/xbt/str.h b/include/xbt/str.h
index 7eb960f..b98b00e 100644 (file)
--- a/include/xbt/str.h
+++ b/include/xbt/str.h
@@ -28,8 +28,6 @@ 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);
 
 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);
 

-XBT_PUBLIC char* xbt_str_join_array(const char* const* strs, const char* sep);
-

 XBT_PUBLIC long int xbt_str_parse_int(const char* str, const char* error_mesg);
 XBT_PUBLIC double xbt_str_parse_double(const char* str, const char* error_mesg);
 
 XBT_PUBLIC long int xbt_str_parse_int(const char* str, const char* error_mesg);
 XBT_PUBLIC double xbt_str_parse_double(const char* str, const char* error_mesg);
 

diff --git a/src/xbt/xbt_str.cpp b/src/xbt/xbt_str.cpp
index 0d784a1..bfaeff9 100644 (file)
--- a/src/xbt/xbt_str.cpp
+++ b/src/xbt/xbt_str.cpp
@@ -192,39 +192,6 @@ xbt_dynar_t xbt_str_split_quoted(const char *s)
   return res;
 }
 
   return res;
 }
 

-/** @brief Join a set of strings as a single string
- *
- * The parameter must be a nullptr-terminated array of chars,
- * just like xbt_dynar_to_array() produces
- */
-char *xbt_str_join_array(const char *const *strs, const char *sep)
-{
-  int amount_strings=0;
-  int len=0;
-
-  if ((not strs) || (not strs[0]))
-    return xbt_strdup("");
-
-  /* compute the length before malloc */
-  for (int i = 0; strs[i]; i++) {
-    len += strlen(strs[i]);
-    amount_strings++;
-  }
-  len += strlen(sep) * amount_strings;
-
-  /* Do the job */
-  char* res = (char*)xbt_malloc(len);
-  char* q   = res;
-  for (int i = 0; strs[i]; i++) {
-    if (i != 0) { // not first loop
-      q += snprintf(q,len, "%s%s", sep, strs[i]);
-    } else {
-      q += snprintf(q,len, "%s",strs[i]);
-    }
-  }
-  return res;
-}
-

 /** @brief Parse an integer out of a string, or raise an error
  *
  * The @a str is passed as argument to your @a error_msg, as follows:
 /** @brief Parse an integer out of a string, or raise an error
  *
  * The @a str is passed as argument to your @a error_msg, as follows: