Three new functions in xbt_str module: split&join (hello perl) and diff (naive LCS...

[simgrid.git] / include / xbt / str.h

diff --git a/include/xbt/str.h b/include/xbt/str.h
index 6068247..7ac8448 100644 (file)
--- a/include/xbt/str.h
+++ b/include/xbt/str.h
@@ -9,6 +9,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/misc.h"
+#include "xbt/dynar.h"
 
 
 
@@ -21,18 +22,27 @@
 
 SG_BEGIN_DECL()
 
+/* snprintf related functions */
 XBT_PUBLIC(int) asprintf  (char **ptr, const char *fmt, /*args*/ ...) _XBT_GNUC_PRINTF(2,3);
 XBT_PUBLIC(int) vasprintf (char **ptr, const char *fmt, va_list ap);
 XBT_PUBLIC(char*) bprintf   (const char*fmt, ...) _XBT_GNUC_PRINTF(1,2);
 
+/* the gettext function. It gets redefined here only if not yet available */
 #if defined(_WIN32) || !defined(__GNUC__)
 XBT_PUBLIC(long) getline(char **lineptr, size_t *n, FILE *stream);
 #endif
 
 /* Trim related functions */
-XBT_PUBLIC(char*) rtrim(char* s, const char* char_list);
-XBT_PUBLIC(char*) ltrim( char* s, const char* char_list);
-XBT_PUBLIC(char*) trim(char* s, const char* char_list);
+XBT_PUBLIC(char*) xbt_str_rtrim(char* s, const char* char_list);
+XBT_PUBLIC(char*) xbt_str_ltrim( char* s, const char* char_list);
+XBT_PUBLIC(char*) xbt_str_trim(char* s, const char* char_list);
+
+XBT_PUBLIC(xbt_dynar_t) xbt_str_split(char *s, const char *sep);
+XBT_PUBLIC(char *) xbt_str_join(xbt_dynar_t dynar, const char *sep);
+
+/* */
+XBT_PUBLIC(void) xbt_str_strip_spaces(char *);
+XBT_PUBLIC(char *) xbt_str_diff(char *a, char *b);
 
 SG_END_DECL()