Use new macros THROWF and RETHROWF.

[simgrid.git] / src / xbt / xbt_str.c

diff --git a/src/xbt/xbt_str.c b/src/xbt/xbt_str.c
index 9a6cfa5..9ec3dde 100644 (file)
--- a/src/xbt/xbt_str.c
+++ b/src/xbt/xbt_str.c
@@ -350,7 +350,7 @@ xbt_dynar_t xbt_str_split_quoted_in_place(char *s) {
       /* Protected char; move it closer */
       memmove(end, end + 1, strlen(end));
       if (*end == '\0')
-        THROW0(arg_error, 0, "String ends with \\");
+        THROWF(arg_error, 0, "String ends with \\");
       end++;                    /* Pass the protected char */
       break;
 
@@ -380,7 +380,7 @@ xbt_dynar_t xbt_str_split_quoted_in_place(char *s) {
     case '\n':
     case '\0':
       if (*end == '\0' && (in_simple_quote || in_double_quote)) {
-        THROW2(arg_error, 0,
+        THROWF(arg_error, 0,
                "End of string found while searching for %c in %s",
                (in_simple_quote ? '\'' : '"'), s);
       }
@@ -445,6 +445,7 @@ xbt_dynar_t xbt_str_split_quoted(const char *s)
   }
   free(str_to_free);
   xbt_dynar_shrink(res, 0);
+  xbt_dynar_free(&parsed);
   return res;
 }
 
@@ -452,10 +453,10 @@ xbt_dynar_t xbt_str_split_quoted(const char *s)
 #include "xbt/str.h"
 
 #define mytest(name, input, expected) \
-  xbt_test_add0(name); \
+  xbt_test_add(name); \
   d=xbt_str_split_quoted(input); \
   s=xbt_str_join(d,"XXX"); \
-  xbt_test_assert3(!strcmp(s,expected),\
+  xbt_test_assert(!strcmp(s,expected),\
                    "Input (%s) leads to (%s) instead of (%s)", \
                    input,s,expected);\
                    free(s); \
@@ -486,10 +487,10 @@ XBT_TEST_UNIT("xbt_str_split_quoted", test_split_quoted, "test the function xbt_
 }
 
 #define mytest_str(name, input, separator, expected) \
-  xbt_test_add0(name); \
+  xbt_test_add(name); \
   d=xbt_str_split_str(input, separator); \
   s=xbt_str_join(d,"XXX"); \
-  xbt_test_assert3(!strcmp(s,expected),\
+  xbt_test_assert(!strcmp(s,expected),\
                    "Input (%s) leads to (%s) instead of (%s)", \
                    input,s,expected);\
                    free(s); \
@@ -509,7 +510,6 @@ XBT_TEST_UNIT("xbt_str_split_str", test_split_str, "test the function xbt_str_sp
 #endif                          /* SIMGRID_TEST */
 
 /** @brief Join a set of strings as a single string */
-
 char *xbt_str_join(xbt_dynar_t dyn, const char *sep)
 {
   int len = 1, dyn_len = xbt_dynar_length(dyn);
@@ -536,6 +536,39 @@ char *xbt_str_join(xbt_dynar_t dyn, const char *sep)
   }
   return res;
 }
+/** @brief Join a set of strings as a single string
+ *
+ * The parameter must be a NULL-terminated array of chars,
+ * just like xbt_dynar_to_array() produces
+ */
+char *xbt_str_join_array(const char *const *strs, const char *sep)
+{
+  char *res,*q;
+  int amount_strings=0;
+  int len=0;
+  int i;
+
+  if ((!strs) || (!strs[0]))
+    return xbt_strdup("");
+
+  /* compute the length before malloc */
+  for (i=0;strs[i];i++) {
+    len += strlen(strs[i]);
+    amount_strings++;
+  }
+  len += strlen(sep) * amount_strings;
+
+  /* Do the job */
+  q = res = xbt_malloc(len);
+  for (i=0;strs[i];i++) {
+    if (i!=0) { // not first loop
+      q += sprintf(q, "%s%s", sep, strs[i]);
+    } else {
+      q += sprintf(q,"%s",strs[i]);
+    }
+  }
+  return res;
+}
 
 #if defined(SIMGRID_NEED_GETLINE) || defined(DOXYGEN)
 /** @brief Get a single line from the stream (reimplementation of the GNU getline)
@@ -687,7 +720,7 @@ static void diff_build_diff(xbt_dynar_t res,
   } else if (i <= 0 && j <= 0) {
     return;
   } else {
-    THROW2(arg_error, 0, "Invalid values: i=%d, j=%d", i, j);
+    THROWF(arg_error, 0, "Invalid values: i=%d, j=%d", i, j);
   }
 
 }