Fix bug in randpool_getN.

[bertos.git] / mware / hashtable.c

diff --git a/mware/hashtable.c b/mware/hashtable.c
index cd9a7b6e32fe39eb34639ddb9d9699eb8e04e174..f95a7665af570f2b3654f5f7ca3be5294d057ab0 100755 (executable)
--- a/mware/hashtable.c
+++ b/mware/hashtable.c
@@ -1,4 +1,4 @@
-/*!
+/**
  * \file
  * <!--
  * Copyright 2004 Develer S.r.l. (http://www.develer.com/)
@@ -61,6 +61,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.8  2007/02/06 16:05:01  asterix
+ *#* Replaced ROTATE_* with ROT* defined in macros.h
+ *#*
+ *#* Revision 1.7  2006/07/19 12:56:27  bernie
+ *#* Convert to new Doxygen style.
+ *#*
  *#* Revision 1.6  2006/06/01 12:27:39  marco
  *#* Added utilities for protocols
  *#*
@@ -69,18 +75,17 @@
 #include "hashtable.h"
 #include <cfg/debug.h>
 #include <cfg/compiler.h>
+#include <cfg/macros.h> //ROTL(), ROTR();
 
 #include <string.h>
 
 
-#define ROTATE_LEFT_16(num, count)     (((num) << (count)) | ((num) >> (16-(count))))
-#define ROTATE_RIGHT_16(num, count)    ROTATE_LEFT_16(num, 16-(count))
 
 typedef const void** HashNodePtr;
 #define NODE_EMPTY(node)               (!*(node))
 #define HT_HAS_INTERNAL_KEY(ht)        (CONFIG_HT_OPTIONAL_INTERNAL_KEY && ht->flags.key_internal)
 
-/*! For hash tables with internal keys, compute the pointer to the internal key for a given \a node. */
+/** For hash tables with internal keys, compute the pointer to the internal key for a given \a node. */
 INLINE uint8_t *key_internal_get_ptr(struct HashTable *ht, HashNodePtr node)
 {
        uint8_t* key_buf = ht->key_data.mem;
@@ -129,7 +134,7 @@ static uint16_t calc_hash(const void* _key, uint8_t key_length)
        int len = (int)key_length;
 
        for (i = 0; i < len; ++i)
-               hash = ROTATE_LEFT_16(hash, 4) ^ key[i];
+               hash = ROTL(hash, 4) ^ key[i];
 
        return hash ^ (hash >> 6) ^ (hash >> 13);
 }
@@ -161,7 +166,7 @@ static HashNodePtr perform_lookup(struct HashTable* ht,
        //  is traversed. Actually MCD(table_size, step) must be 1, but
        //  table_size is always a power of 2, so we just ensure that step is
        //  never a multiple of 2.
-       step = (ROTATE_RIGHT_16(hash, ht->max_elts_log2) & mask) | 1;
+       step = (ROTR(hash, ht->max_elts_log2) & mask) | 1;
 
        do
        {