X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=ucw%2Fhashfunc.h;h=8d198e1bd6e0cb875fd2aa69c59cb4988b5e4d29;hb=959566090f98dd31eaa67d3d5959b641e5fe902b;hp=7250119a6723d199d2a3db0fb248634e72eb3dcb;hpb=b09773df69403d903beac3d75ff1d7665cbbc55e;p=libucw.git

diff --git a/ucw/hashfunc.h b/ucw/hashfunc.h
index 7250119a..8d198e1b 100644
--- a/ucw/hashfunc.h
+++ b/ucw/hashfunc.h
@@ -11,26 +11,39 @@
 #ifndef _UCW_HASHFUNC_H
 #define _UCW_HASHFUNC_H
 
-#include "ucw/lib.h"
+#include <ucw/lib.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define hash_block ucw_hash_block
+#define hash_block_aligned ucw_hash_block_aligned
+#define hash_string ucw_hash_string
+#define hash_string_aligned ucw_hash_string_aligned
+#define hash_string_nocase ucw_hash_string_nocase
+#define str_len ucw_str_len
+#define str_len_aligned ucw_str_len_aligned
+#endif
 
 /*** === String hashes [[strhash]] ***/
 
-/* The following functions need str to be aligned to sizeof(uns).  */
-uns str_len_aligned(const char *str) PURE; /** Get the string length (not a really useful hash function, but there is no better place for it). The string must be aligned to sizeof(uns). For unaligned see @str_len(). **/
-uns hash_string_aligned(const char *str) PURE; /** Hash the string. The string must be aligned to sizeof(uns). For unaligned see @hash_string(). **/
-uns hash_block_aligned(const byte *str, uns len) PURE; /** Hash arbitrary data. They must be aligned to sizeof(uns). For unaligned see @hash_block(). **/
+/* The following functions need str to be aligned to sizeof(uint).  */
+uint str_len_aligned(const char *str) PURE; /** Get the string length (not a really useful hash function, but there is no better place for it). The string must be aligned to sizeof(uint). For unaligned see @str_len(). **/
+uint hash_string_aligned(const char *str) PURE; /** Hash the string. The string must be aligned to sizeof(uint). For unaligned see @hash_string(). **/
+uint hash_block_aligned(const byte *buf, uint len) PURE; /** Hash arbitrary data. They must be aligned to sizeof(uint). For unaligned see @hash_block(). **/
 
-#ifdef	CPU_ALLOW_UNALIGNED
+#ifdef CPU_ALLOW_UNALIGNED
+#undef str_len
+#undef hash_string
+#undef hash_block
 #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 char *str) PURE; /** Get the string length. If you know it is aligned to sizeof(uns), you can use faster @str_len_aligned(). **/
-uns hash_string(const char *str) PURE; /** Hash the string. If it is aligned to sizeof(uns), you can use faster @hash_string_aligned(). **/
-uns hash_block(const byte *str, uns len) PURE; /** Hash arbitrary data. If they are aligned to sizeof(uns), use faster @hash_block_aligned(). **/
+uint str_len(const char *str) PURE; /** Get the string length. If you know it is aligned to sizeof(uint), you can use faster @str_len_aligned(). **/
+uint hash_string(const char *str) PURE; /** Hash the string. If it is aligned to sizeof(uint), you can use faster @hash_string_aligned(). **/
+uint hash_block(const byte *buf, uint len) PURE; /** Hash arbitrary data. If they are aligned to sizeof(uint), use faster @hash_block_aligned(). **/
 #endif
 
-uns hash_string_nocase(const char *str) PURE; /** Hash the string in a case insensitive way. Works only with ASCII characters. **/
+uint hash_string_nocase(const char *str) PURE; /** Hash the string in a case insensitive way. Works only with ASCII characters. **/
 
 /*** === Integer hashes [[inthash]] ***/
 
@@ -40,8 +53,8 @@ uns hash_string_nocase(const char *str) PURE; /** Hash the string in a case inse
  * of using shifts and adds on architectures where multiplication
  * instructions are slow).
  */
-static inline uns CONST hash_u32(uns x) { return 0x01008041*x; } /** Hash a 32 bit unsigned integer. **/
-static inline uns CONST hash_u64(u64 x) { return hash_u32((uns)x ^ (uns)(x >> 32)); } /** Hash a 64 bit unsigned integer. **/
-static inline uns CONST hash_pointer(void *x) { return ((sizeof(x) <= 4) ? hash_u32((uns)(uintptr_t)x) : hash_u64((u64)(uintptr_t)x)); } /** Hash a pointer. **/
+static inline uint CONST hash_u32(uint x) { return 0x01008041*x; } /** Hash a 32 bit unsigned integer. **/
+static inline uint CONST hash_u64(u64 x) { return hash_u32((uint)x ^ (uint)(x >> 32)); } /** Hash a 64 bit unsigned integer. **/
+static inline uint CONST hash_pointer(void *x) { return ((sizeof(x) <= 4) ? hash_u32((uint)(uintptr_t)x) : hash_u64((u64)(uintptr_t)x)); } /** Hash a pointer. **/
 
 #endif