X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ad1cda79f06bca8e0178671b404700c07c23c925..62c5e83a98d204cb3bf5c7e99929fd12a14f55f3:/include/xbt/str.h

diff --git a/include/xbt/str.h b/include/xbt/str.h
index f6abd85f8b..225ef425bd 100644
--- a/include/xbt/str.h
+++ b/include/xbt/str.h
@@ -1,9 +1,7 @@
-/* $Id$ */
-
 /* str.h - XBT string related functions.                                    */
 
-/* Copyright (c) 2004-7, Martin Quinson, Arnaud Legrand and  Cherier Malek. */
-/* All rights reserved.                                                     */
+/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -11,10 +9,11 @@
 #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 "simgrid_config.h"     /* FILE for getline */
 
 SG_BEGIN_DECL()
 
@@ -26,51 +25,29 @@ SG_BEGIN_DECL()
  * 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
- * return a pointer to it via the first parameter.  This pointer
- * 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);
-/** @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);
-/** @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);
-
-/* 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);
-#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_quoted_in_place(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(char *) xbt_str_join_array(const char *const *strs, const char *sep);
 
 /* */
-void xbt_str_subst(char *str, char from, char to, int amount);
+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);
+XBT_PUBLIC(char *) xbt_str_diff(const char *a, const char *b);
+
+XBT_PUBLIC(char *) xbt_str_from_file(FILE * file);
 
 /** @brief Classical alias to (char*)
  *
@@ -81,9 +58,4 @@ typedef char *xbt_string_t;
 /**@}*/
 
 SG_END_DECL()
-
-#endif /* XBT_STR_H */
-
-
-
-
+#endif                          /* XBT_STR_H */