Unit testing framework and devicetree framework refactoring (#50)

[lunaix-os.git] / lunaix-os / includes / lunaix / ds / hstr.h

diff --git a/lunaix-os/includes/lunaix/ds/hstr.h b/lunaix-os/includes/lunaix/ds/hstr.h
index d954103ce44f797024133d41f2189e37c97bc4ca..77096aa8a845f6c35dbb0d0152bb94f61734dd1c 100644 (file)
--- a/lunaix-os/includes/lunaix/ds/hstr.h
+++ b/lunaix-os/includes/lunaix/ds/hstr.h
@@ -1,14 +1,14 @@
 #ifndef __LUNAIX_HSTR_H
 #define __LUNAIX_HSTR_H
 
-#include <lib/hash.h>
+#include <klibc/hash.h>
 
 #define HSTR_FULL_HASH 32
 
 struct hstr
 {
-    u32_t hash;
-    u32_t len;
+    unsigned int hash;
+    unsigned int len;
     const char* value;
 };
 
@@ -26,7 +26,11 @@ struct hstr
 
 #define HSTR_EQ(str1, str2) ((str1)->hash == (str2)->hash)
 
-inline void
+#define HSTR_VAL(hstr)  ((hstr).value)
+#define HSTR_LEN(hstr)  ((hstr).len)
+#define HSTR_HASH(hstr) ((hstr).hash)
+
+static inline void
 hstr_rehash(struct hstr* hash_str, u32_t truncate_to)
 {
     hash_str->hash = strhash_32(hash_str->value, truncate_to);