X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Fhashfunc.h;h=a9fb1a315df182169ef734644e8ab408de5f352a;hb=8cc8233fed6199da4e451b9517b14622291ec06c;hp=e60e3f70628f38feaa843374f2e665ef9a3ac7df;hpb=efb6ac56ec7017fede18527387546e2e1d776795;p=libucw.git

diff --git a/lib/hashfunc.h b/lib/hashfunc.h
index e60e3f70..a9fb1a31 100644
--- a/lib/hashfunc.h
+++ b/lib/hashfunc.h
@@ -14,21 +14,21 @@
 #include "lib/lib.h"
 
 /* The following functions need str to be aligned to uns.  */
-uns str_len_aligned(const byte *str) CONST;
-uns hash_string_aligned(const byte *str) CONST;
-uns hash_block_aligned(const byte *str, uns len) CONST;
+uns str_len_aligned(const char *str) PURE;
+uns hash_string_aligned(const char *str) PURE;
+uns hash_block_aligned(const byte *str, uns len) PURE;
 
 #ifdef	CPU_ALLOW_UNALIGNED
 #define	str_len(str)		str_len_aligned(str)
 #define	hash_string(str)	hash_string_aligned(str)
 #define	hash_block(str, len)	hash_block_aligned(str, len)
 #else
-uns str_len(const byte *str) CONST;
-uns hash_string(const byte *str) CONST;
-uns hash_block(const byte *str, uns len) CONST;
+uns str_len(const char *str) PURE;
+uns hash_string(const char *str) PURE;
+uns hash_block(const byte *str, uns len) PURE;
 #endif
 
-uns hash_string_nocase(const byte *str) CONST;
+uns hash_string_nocase(const char *str) PURE;
 
 /*
  *  We hash integers by multiplying by a reasonably large prime with
@@ -38,6 +38,6 @@ uns hash_string_nocase(const byte *str) CONST;
  */
 static inline uns CONST hash_u32(uns x) { return 0x01008041*x; }
 static inline uns CONST hash_u64(u64 x) { return hash_u32((uns)x ^ (uns)(x >> 32)); }
-static inline uns CONST hash_pointer(void *x) { return ((sizeof(x) <= 4) ? hash_u32((uns)(addr_int_t)x) : hash_u64((u64)(addr_int_t)x)); }
+static inline uns CONST hash_pointer(void *x) { return ((sizeof(x) <= 4) ? hash_u32((uns)(uintptr_t)x) : hash_u64((u64)(uintptr_t)x)); }
 
 #endif