X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e6a50b4cff693954278df4f26b46ac9abe689e79..9fb9a973ff6b7ed01c40a1abb7f54feaf0823d4f:/include/xbt/str.h

diff --git a/include/xbt/str.h b/include/xbt/str.h
index 49e99fcec9..e866e52551 100644
--- a/include/xbt/str.h
+++ b/include/xbt/str.h
@@ -11,25 +11,25 @@
 #ifndef XBT_STR_H
 #define XBT_STR_H
 
-#include <stdarg.h> /* va_* */
+#include <stdarg.h>             /* va_* */
 #include "xbt/misc.h"
 #include "xbt/dynar.h"
-#include <stdio.h> /* FILE for getline */
+#include "xbt/dict.h"
+#include <stdio.h>              /* FILE for getline */
 
 SG_BEGIN_DECL()
 
 /** @addtogroup XBT_str
  *  @brief String manipulation functions
- * 
- * This module defines several string related functions. We redefine some quite classical 
- * functions on the platforms were they are not nativaly defined (such as getline() or 
- * asprintf()), while some other are a bit more exotic. 
+ *
+ * This module defines several string related functions. We redefine some quite classical
+ * functions on the platforms were they are not nativaly defined (such as getline() or
+ * asprintf()), while some other are a bit more exotic.
  * @{
  */
-  
 /* snprintf related functions */
 /** @brief print to allocated string (reimplemented when not provided by the system)
- * 
+ *
  * The functions asprintf() and vasprintf() are analogues of
  * sprintf() and vsprintf(), except that they allocate a string large
  * enough to hold the output including the terminating null byte, and
@@ -37,48 +37,53 @@ SG_BEGIN_DECL()
  * should be passed to free(3) to release the allocated storage when
  * it is no longer needed.
  */
-XBT_PUBLIC(int) asprintf  (char **ptr, const char *fmt, /*args*/ ...) _XBT_GNUC_PRINTF(2,3);
+XBT_PUBLIC(int) asprintf(char **ptr, const char *fmt,   /*args */
+                         ...) _XBT_GNUC_PRINTF(2, 3);
 /** @brief print to allocated string (reimplemented when not provided by the system)
- * 
+ *
  * See asprintf()
  */
-XBT_PUBLIC(int) vasprintf (char **ptr, const char *fmt, va_list ap);
+XBT_PUBLIC(int) vasprintf(char **ptr, const char *fmt, va_list ap);
 /** @brief print to allocated string
- * 
+ *
  * Works just like asprintf(), but returns a pointer to the newly created string
  */
-XBT_PUBLIC(char*) bprintf   (const char*fmt, ...) _XBT_GNUC_PRINTF(1,2);
+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(__USE_GNU) || defined(DOXYGEN)
-XBT_PUBLIC(long) getline(char **lineptr, size_t *n, FILE *stream);
+//XBT_PUBLIC(long) getline(char **lineptr, size_t * n, FILE * stream);
 #endif
 
 /* Trim related functions */
-XBT_PUBLIC(void) xbt_str_rtrim(char* s, const char* char_list);
-XBT_PUBLIC(void) xbt_str_ltrim( char* s, const char* char_list);
-XBT_PUBLIC(void) xbt_str_trim(char* s, const char* char_list);
+XBT_PUBLIC(void) xbt_str_rtrim(char *s, const char *char_list);
+XBT_PUBLIC(void) xbt_str_ltrim(char *s, const char *char_list);
+XBT_PUBLIC(void) xbt_str_trim(char *s, const char *char_list);
 
 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_str(const char *s, const char *sep);
+
 XBT_PUBLIC(char *) xbt_str_join(xbt_dynar_t dynar, const char *sep);
 
+/* */
+XBT_PUBLIC(void) xbt_str_subst(char *str, char from, char to, int amount);
+XBT_PUBLIC(char *) xbt_str_varsubst(char *str, xbt_dict_t patterns);
+
 /* */
 XBT_PUBLIC(void) xbt_str_strip_spaces(char *);
 XBT_PUBLIC(char *) xbt_str_diff(char *a, char *b);
 
-/** @brief Classical alias to (char*) 
+
+XBT_PUBLIC(char*)xbt_str_from_file(FILE *file);
+
+/** @brief Classical alias to (char*)
  *
  * This of almost no use, beside cosmetics and the GRAS parsing macro (see \ref GRAS_dd_auto).
  */
-typedef char *xbt_string_t;
+     typedef char *xbt_string_t;
 
 /**@}*/
 
 SG_END_DECL()
-
 #endif /* XBT_STR_H */
-
-
-
-