fix previous commits, bummer

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5954 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/include/xbt/str.h b/include/xbt/str.h
index f6abd85..14ed932 100644 (file)
--- a/include/xbt/str.h
+++ b/include/xbt/str.h
@@ -14,6 +14,7 @@
 #include <stdarg.h> /* va_* */
 #include "xbt/misc.h"
 #include "xbt/dynar.h"
 #include <stdarg.h> /* va_* */
 #include "xbt/misc.h"
 #include "xbt/dynar.h"

+#include "xbt/dict.h"

 #include <stdio.h> /* FILE for getline */
 
 SG_BEGIN_DECL()
 #include <stdio.h> /* FILE for getline */
 
 SG_BEGIN_DECL()


@@ -66,7 +67,8 @@ 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(xbt_dynar_t dynar, 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(void) xbt_str_strip_spaces(char *);

diff --git a/include/xbt/strbuff.h b/include/xbt/strbuff.h
index 63be41d..ad2f739 100644 (file)
--- a/include/xbt/strbuff.h
+++ b/include/xbt/strbuff.h
@@ -28,7 +28,7 @@ typedef struct {
 
 XBT_PUBLIC(void)          xbt_strbuff_empty(xbt_strbuff_t b);
 XBT_PUBLIC(xbt_strbuff_t) xbt_strbuff_new(void);
 
 XBT_PUBLIC(void)          xbt_strbuff_empty(xbt_strbuff_t b);
 XBT_PUBLIC(xbt_strbuff_t) xbt_strbuff_new(void);

-XBT_PUBLIC(xbt_strbuff_t) xbt_strbuff_new_from(void);
+XBT_PUBLIC(xbt_strbuff_t) xbt_strbuff_new_from(char* s);

 XBT_PUBLIC(void)          xbt_strbuff_free(xbt_strbuff_t b);
 XBT_PUBLIC(void)          xbt_strbuff_free_container(xbt_strbuff_t b);
 XBT_PUBLIC(void)          xbt_strbuff_append(xbt_strbuff_t b, const char *toadd);
 XBT_PUBLIC(void)          xbt_strbuff_free(xbt_strbuff_t b);
 XBT_PUBLIC(void)          xbt_strbuff_free_container(xbt_strbuff_t b);
 XBT_PUBLIC(void)          xbt_strbuff_append(xbt_strbuff_t b, const char *toadd);

diff --git a/src/xbt/xbt_strbuff.c b/src/xbt/xbt_strbuff.c
index e12022a..5b9ee78 100644 (file)
--- a/src/xbt/xbt_strbuff.c
+++ b/src/xbt/xbt_strbuff.c
@@ -39,7 +39,7 @@ xbt_strbuff_t xbt_strbuff_new(void) {
  *
  * Beware, we store the ctn directly, not a copy of it
  */
  *
  * Beware, we store the ctn directly, not a copy of it
  */

-xbt_strbuff_t xbt_strbuff_from(char *ctn) {
+xbt_strbuff_t xbt_strbuff_new_from(char *ctn) {

   xbt_strbuff_t res=malloc(sizeof(s_xbt_strbuff_t));
   res->data=ctn;
   res->used=res->size=strlen(ctn);
   xbt_strbuff_t res=malloc(sizeof(s_xbt_strbuff_t));
   res->data=ctn;
   res->used=res->size=strlen(ctn);