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 333461a..78786a9 100644 (file)
--- a/include/xbt/str.h
+++ b/include/xbt/str.h
@@ -15,7 +15,7 @@
 #include "xbt/misc.h"
 #include "xbt/dynar.h"
 #include "xbt/dict.h"
 #include "xbt/misc.h"
 #include "xbt/dynar.h"
 #include "xbt/dict.h"

-#include <stdio.h>              /* FILE for getline */
+#include "simgrid_config.h"     /* FILE for getline */

 
 SG_BEGIN_DECL()
 
 
 SG_BEGIN_DECL()
 


@@ -27,33 +27,7 @@ SG_BEGIN_DECL()
  * asprintf()), while some other are a bit more exotic.
  * @{
  */
  * 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);
 
 /* Trim related functions */
 XBT_PUBLIC(void) xbt_str_rtrim(char *s, const char *char_list);


@@ -74,6 +48,9 @@ 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(void) xbt_str_strip_spaces(char *);
 XBT_PUBLIC(char *) xbt_str_diff(char *a, char *b);
 

+
+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).
 /** @brief Classical alias to (char*)
  *
  * This of almost no use, beside cosmetics and the GRAS parsing macro (see \ref GRAS_dd_auto).