X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3347b50014c1857b9d9f3a035d27b67a54beaea8..e694957c5830a9f1407392fa7f76796274aa4d18:/include/xbt/str.h

diff --git a/include/xbt/str.h b/include/xbt/str.h
index 63a3826f39..cddd67d724 100644
--- a/include/xbt/str.h
+++ b/include/xbt/str.h
@@ -21,10 +21,15 @@ SG_BEGIN_DECL()
  *  @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
+ * functions on the platforms were they are not nativaly defined (such as xbt_getline() or
  * asprintf()), while some other are a bit more exotic.
  * @{
  */
+/* Our own implementation of getline, mainly useful on the platforms not enjoying this function */
+#include <stdio.h>  /* FILE */
+#include <stdlib.h> /* size_t, ssize_t */
+XBT_PUBLIC(ssize_t) xbt_getline(char **lineptr, size_t * n, FILE * stream);
+
 /* 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);
@@ -49,13 +54,15 @@ XBT_PUBLIC(char *) xbt_str_diff(const char *a, const char *b);
 
 XBT_PUBLIC(char *) xbt_str_from_file(FILE * file);
 
+XBT_PUBLIC(int) xbt_str_start_with(const char* str, const char* start);
+
 #define DJB2_HASH_FUNCTION
 //#define FNV_HASH_FUNCTION
 
 /**
  * @brief Returns the hash code of a string.
  */
-static XBT_INLINE unsigned int xbt_dict_hash_ext(const char *str, int str_len)
+static XBT_INLINE unsigned int xbt_str_hash_ext(const char *str, int str_len)
 {
 
 #ifdef DJB2_HASH_FUNCTION
@@ -97,7 +104,7 @@ static XBT_INLINE unsigned int xbt_dict_hash_ext(const char *str, int str_len)
 /**
  * @brief Returns the hash code of a string.
  */
-static XBT_INLINE unsigned int xbt_dict_hash(const char *str)
+static XBT_INLINE unsigned int xbt_str_hash(const char *str)
 {
 #ifdef DJB2_HASH_FUNCTION
   /* fast implementation of djb2 algorithm */
@@ -132,12 +139,6 @@ static XBT_INLINE unsigned int xbt_dict_hash(const char *str)
   return hash;
 }
                                                       
-/** @brief Classical alias to (char*)
- *
- * This of almost no use, beside cosmetics and the XBT datadesc parsing macro (see \ref XBT_dd_auto).
- */
-typedef char *xbt_string_t;
-
 /**@}*/
 
 SG_END_DECL()