Boot framework rework (#45)

[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 f3fa89efd39deb3f07504517766c58b433ee4a16..169f0b8eccb0de6ad0c795cb4ffe02041f660e4c 100644 (file)
--- a/lunaix-os/includes/lunaix/ds/hstr.h
+++ b/lunaix-os/includes/lunaix/ds/hstr.h
@@ -1,7 +1,7 @@
 #ifndef __LUNAIX_HSTR_H
 #define __LUNAIX_HSTR_H
 
 #ifndef __LUNAIX_HSTR_H
 #define __LUNAIX_HSTR_H
 

-#include <lib/hash.h>
+#include <klibc/hash.h>

 
 #define HSTR_FULL_HASH 32
 
 
 #define HSTR_FULL_HASH 32
 


@@ -9,7 +9,7 @@ struct hstr
 {
     unsigned int hash;
     unsigned int len;
 {
     unsigned int hash;
     unsigned int len;

-    char* value;
+    const char* value;

 };
 
 #define HSTR(str, length)                                                      \
 };
 
 #define HSTR(str, length)                                                      \


@@ -26,10 +26,17 @@ struct hstr
 
 #define HSTR_EQ(str1, str2) ((str1)->hash == (str2)->hash)
 
 
 #define HSTR_EQ(str1, str2) ((str1)->hash == (str2)->hash)
 

+#define HSTR_VAL(hstr)  ((hstr).value)
+#define HSTR_LEN(hstr)  ((hstr).len)
+#define HSTR_HASH(hstr) ((hstr).hash)
+

 inline void
 inline void

-hstr_rehash(struct hstr* hash_str, unsigned int truncate_to)
+hstr_rehash(struct hstr* hash_str, u32_t truncate_to)

 {
     hash_str->hash = strhash_32(hash_str->value, truncate_to);
 }
 
 {
     hash_str->hash = strhash_32(hash_str->value, truncate_to);
 }
 

+void
+hstrcpy(struct hstr* dest, struct hstr* src);
+

 #endif /* __LUNAIX_HSTR_H */
 #endif /* __LUNAIX_HSTR_H */