A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the right header for the getline management.
[simgrid.git]
/
include
/
xbt
/
str.h
diff --git
a/include/xbt/str.h
b/include/xbt/str.h
index
6a9bccf
..
78786a9
100644
(file)
--- a/
include/xbt/str.h
+++ b/
include/xbt/str.h
@@
-2,37
+2,62
@@
/* str.h - XBT string related functions. */
/* str.h - XBT string related functions. */
-/* Copyright (c) 2004-7, Martin Quinson
and Arnaud Legrand.
*/
+/* Copyright (c) 2004-7, Martin Quinson
, Arnaud Legrand and Cherier Malek.
*/
/* 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. */
/* 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. */
+#ifndef XBT_STR_H
+#define XBT_STR_H
+
+#include <stdarg.h> /* va_* */
#include "xbt/misc.h"
#include "xbt/misc.h"
+#include "xbt/dynar.h"
+#include "xbt/dict.h"
+#include "simgrid_config.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.
+ * @{
+ */
-#ifndef XBT_STR_H
-#define XBT_STR_H
-#if defined(_WIN32)
-#include <stdio.h>
-#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);
-SG_BEGIN_DECL()
+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(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);
+XBT_PUBLIC(char *) xbt_str_join(xbt_dynar_t dynar, const char *sep);
-#if defined(_WIN32) || !defined(__GNUC__)
-XBT_PUBLIC(
long) getline(char **lineptr, size_t *n, FILE *stream
);
-#endif
+/* */
+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);
-SG_END_DECL()
+/* */
+XBT_PUBLIC(void) xbt_str_strip_spaces(char *);
+XBT_PUBLIC(char *) xbt_str_diff(char *a, char *b);
-#endif /* XBT_STR_H */
+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;
+/**@}*/
+SG_END_DECL()
+#endif /* XBT_STR_H */