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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
include
/
xbt
/
str.h
diff --git
a/include/xbt/str.h
b/include/xbt/str.h
index
2152866
..
8068459
100644
(file)
--- a/
include/xbt/str.h
+++ b/
include/xbt/str.h
@@
-1,6
+1,6
@@
/* str.h - XBT string related functions. */
/* str.h - XBT string related functions. */
-/* Copyright (c) 2007-201
5
. The SimGrid Team.
+/* Copyright (c) 2007-201
7
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-9,17
+9,13
@@
#ifndef XBT_STR_H
#define XBT_STR_H
#ifndef XBT_STR_H
#define XBT_STR_H
-#include "xbt/misc.h"
-#include "xbt/dynar.h"
#include "xbt/dict.h"
#include "xbt/dict.h"
+#include "xbt/dynar.h"
+#include "xbt/misc.h"
#include <stdarg.h> /* va_* */
#include <stdio.h> /* FILE */
#include <stdarg.h> /* va_* */
#include <stdio.h> /* FILE */
-#ifdef _MSC_VER
-#define strcasecmp _stricmp
-#endif
-
SG_BEGIN_DECL()
/** @addtogroup XBT_str
SG_BEGIN_DECL()
/** @addtogroup XBT_str
@@
-30,49
+26,32
@@
SG_BEGIN_DECL()
* @{
*/
* @{
*/
-/* 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);
-
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_quoted_in_place(char *s);
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_quoted_in_place(char *s);
-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_array(const char *const *strs, const char *sep);
XBT_PUBLIC(char *) xbt_str_join_array(const char *const *strs, const char *sep);
-/* */
-XBT_PUBLIC(void) xbt_str_subst(char *str, char from, char to, int amount);
-XBT_PUBLIC(char *) xbt_str_varsubst(const char *str, xbt_dict_t patterns);
-
-/* */
-XBT_PUBLIC(char *) xbt_str_from_file(FILE * file);
-
XBT_PUBLIC(long int) xbt_str_parse_int(const char* str, const char* error_msg);
XBT_PUBLIC(double) xbt_str_parse_double(const char* str, const char* error_msg);
XBT_PUBLIC(long int) xbt_str_parse_int(const char* str, const char* error_msg);
XBT_PUBLIC(double) xbt_str_parse_double(const char* str, const char* error_msg);
-#define DJB2_HASH_FUNCTION
-//#define FNV_HASH_FUNCTION
+#define
XBT_
DJB2_HASH_FUNCTION
+//#define
XBT_
FNV_HASH_FUNCTION
/**
* @brief Returns the hash code of a string.
*/
/**
* @brief Returns the hash code of a string.
*/
-static
XBT_INLINE
unsigned int xbt_str_hash_ext(const char *str, int str_len)
+static
inline
unsigned int xbt_str_hash_ext(const char *str, int str_len)
{
{
-
-#ifdef DJB2_HASH_FUNCTION
+#ifdef XBT_DJB2_HASH_FUNCTION
/* fast implementation of djb2 algorithm */
/* fast implementation of djb2 algorithm */
- int c;
unsigned int hash = 5381;
while (str_len--) {
unsigned int hash = 5381;
while (str_len--) {
- c = *str++;
+
int
c = *str++;
hash = ((hash << 5) + hash) + c; /* hash * 33 + c */
}
hash = ((hash << 5) + hash) + c; /* hash * 33 + c */
}
-# elif defined(FNV_HASH_FUNCTION)
+# elif defined(
XBT_
FNV_HASH_FUNCTION)
unsigned int hash = 0x811c9dc5;
unsigned char *bp = (unsigned char *) str; /* start of buffer */
unsigned char *be = bp + str_len; /* beyond end of buffer */
unsigned int hash = 0x811c9dc5;
unsigned char *bp = (unsigned char *) str; /* start of buffer */
unsigned char *be = bp + str_len; /* beyond end of buffer */
@@
-102,9
+81,9
@@
static XBT_INLINE unsigned int xbt_str_hash_ext(const char *str, int str_len)
/**
* @brief Returns the hash code of a string.
*/
/**
* @brief Returns the hash code of a string.
*/
-static
XBT_INLINE
unsigned int xbt_str_hash(const char *str)
+static
inline
unsigned int xbt_str_hash(const char *str)
{
{
-#ifdef DJB2_HASH_FUNCTION
+#ifdef
XBT_
DJB2_HASH_FUNCTION
/* fast implementation of djb2 algorithm */
int c;
unsigned int hash = 5381;
/* fast implementation of djb2 algorithm */
int c;
unsigned int hash = 5381;
@@
-113,14
+92,12
@@
static XBT_INLINE unsigned int xbt_str_hash(const char *str)
hash = ((hash << 5) + hash) + c; /* hash * 33 + c */
}
hash = ((hash << 5) + hash) + c; /* hash * 33 + c */
}
-# elif defined(FNV_HASH_FUNCTION)
+# elif defined(
XBT_
FNV_HASH_FUNCTION)
unsigned int hash = 0x811c9dc5;
while (*str) {
/* multiply by the 32 bit FNV magic prime mod 2^32 */
unsigned int hash = 0x811c9dc5;
while (*str) {
/* multiply by the 32 bit FNV magic prime mod 2^32 */
- hash +=
- (hash << 1) + (hash << 4) + (hash << 7) + (hash << 8) +
- (hash << 24);
+ hash += (hash << 1) + (hash << 4) + (hash << 7) + (hash << 8) + (hash << 24);
/* xor the bottom with the current byte */
hash ^= (unsigned int) *str++;
/* xor the bottom with the current byte */
hash ^= (unsigned int) *str++;
@@
-138,6
+115,5
@@
static XBT_INLINE unsigned int xbt_str_hash(const char *str)
}
/**@}*/
}
/**@}*/
-
SG_END_DECL()
#endif /* XBT_STR_H */
SG_END_DECL()
#endif /* XBT_STR_H */