Changeset a73aaec1 in mainline for uspace/lib/c/include/adt/hash.h

Timestamp:

2020-04-13T20:52:27Z (4 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

81c4e6ec

Parents:

aa0faeca

Message:

Removing recentely added hashing function

The function hash_string() implemented the
djb2 algorithm for hashing strings. As requested
during a review this has been changed to the
existing hashing function instead of implementing
a new one

File:

• uspace/lib/c/include/adt/hash.h (modified) (1 diff)

uspace/lib/c/include/adt/hash.h

@@ -115 +115 @@
  * TODO Modify also same file in kernel subtree?
  *
- * @param[in]  str     NULL-terminated string (not NULL)
+ * @param[in]  str     NULL-terminated string
+ * @return hash of the given string
  */
 static inline size_t hash_string(const char *str)
 {
-        /*
-         * Using djb2 function
-         * http://www.cse.yorku.ca/~oz/hash.html
-         */
-        size_t hash = 5381;
-        char c;
-        while ((c = *str++)) {
-                hash = ((hash << 5) + hash) + c; /* hash * 33 + c */
+        size_t hash = 0;
+        if (str != NULL) {
+                char c;
+                while ((c = *str++) != 0) {
+                        hash = hash_combine(hash, c);
+                }
         }
+
         return hash;
 }