X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e4abd3f271729beeff499da36267bfb274dd1f6d..3d845df082d79ab89649c1a8829eea201ae01085:/include/xbt/str.h

diff --git a/include/xbt/str.h b/include/xbt/str.h
index fb2bc397b3..2a64e95528 100644
--- a/include/xbt/str.h
+++ b/include/xbt/str.h
@@ -1,6 +1,6 @@
 /* str.h - XBT string related functions.                                    */
 
-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -10,21 +10,22 @@
 #define XBT_STR_H
 
 #include <stdarg.h>             /* va_* */
+#include <stdio.h>  /* FILE */
 #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.
+ * This module defines several string related functions. Looking at the diversity of string
+ * manipulation functions that are provided, you can see that several SimGrid core developers
+ * actually like Perl.
  * @{
  */
+
 /* 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);
@@ -63,14 +64,14 @@ static XBT_INLINE unsigned int xbt_str_hash_ext(const char *str, int str_len)
 #ifdef DJB2_HASH_FUNCTION
   /* fast implementation of djb2 algorithm */
   int c;
-  register unsigned int hash = 5381;
+  unsigned int hash = 5381;
 
   while (str_len--) {
     c = *str++;
     hash = ((hash << 5) + hash) + c;    /* hash * 33 + c */
   }
 # elif defined(FNV_HASH_FUNCTION)
-  register unsigned int hash = 0x811c9dc5;
+  unsigned int hash = 0x811c9dc5;
   unsigned char *bp = (unsigned char *) str;    /* start of buffer */
   unsigned char *be = bp + str_len;     /* beyond end of buffer */
 
@@ -85,7 +86,7 @@ static XBT_INLINE unsigned int xbt_str_hash_ext(const char *str, int str_len)
   }
 
 # else
-  register unsigned int hash = 0;
+  unsigned int hash = 0;
 
   while (str_len--) {
     hash += (*str) * (*str);
@@ -104,14 +105,14 @@ static XBT_INLINE unsigned int xbt_str_hash(const char *str)
 #ifdef DJB2_HASH_FUNCTION
   /* fast implementation of djb2 algorithm */
   int c;
-  register unsigned int hash = 5381;
+  unsigned int hash = 5381;
 
   while ((c = *str++)) {
     hash = ((hash << 5) + hash) + c;    /* hash * 33 + c */
   }
 
 # elif defined(FNV_HASH_FUNCTION)
-  register unsigned int hash = 0x811c9dc5;
+  unsigned int hash = 0x811c9dc5;
 
   while (*str) {
     /* multiply by the 32 bit FNV magic prime mod 2^32 */
@@ -124,7 +125,7 @@ static XBT_INLINE unsigned int xbt_str_hash(const char *str)
   }
 
 # else
-  register unsigned int hash = 0;
+  unsigned int hash = 0;
 
   while (*str) {
     hash += (*str) * (*str);
@@ -133,7 +134,7 @@ static XBT_INLINE unsigned int xbt_str_hash(const char *str)
 #endif
   return hash;
 }
-                                                      
+
 /**@}*/
 
 SG_END_DECL()