scripts: move hash function from scripts/kconfig/ to scripts/include/

This function was originally added by commit 8af27e1dc4e4 ("fixdep: use
hash table instead of a single array").

Move it to scripts/include/ so that other host programs can use it.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

diff --git a/scripts/include/hash.h b/scripts/include/hash.h
new file mode 100644 (file)
index 0000000..ce2bc43
--- /dev/null
+++ b/scripts/include/hash.h
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef HASH_H
+#define HASH_H
+
+static inline unsigned int hash_str(const char *s)
+{
+       /* fnv32 hash */
+       unsigned int hash = 2166136261U;
+
+       for (; *s; s++)
+               hash = (hash ^ *s) * 0x01000193;
+       return hash;
+}
+
+#endif /* HASH_H */

diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index ddfb2b1cb7375c3e83f7423f1d795f1a6aa1becd..b8ebc3094a2347d609bece1caf7278f3d61e1303 100644 (file)
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -51,7 +51,6 @@ static inline void xfwrite(const void *str, size_t len, size_t count, FILE *out)
 }
 
 /* util.c */
-unsigned int strhash(const char *s);
 const char *file_lookup(const char *name);
 
 /* lexer.l */

diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 6793f016af5e8b4903be985c237e2d485a323c98..6243f0143ecf5bd0d1c7519d065e83d0968edb33 100644 (file)
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -9,6 +9,7 @@
 #include <string.h>
 #include <regex.h>
 
+#include <hash.h>
 #include <xalloc.h>
 #include "internal.h"
 #include "lkc.h"
@@ -893,7 +894,7 @@ struct symbol *sym_lookup(const char *name, int flags)
                        case 'n': return &symbol_no;
                        }
                }
-               hash = strhash(name);
+               hash = hash_str(name);
 
                hash_for_each_possible(sym_hashtable, symbol, node, hash) {
                        if (symbol->name &&
@@ -936,7 +937,7 @@ struct symbol *sym_find(const char *name)
                case 'n': return &symbol_no;
                }
        }
-       hash = strhash(name);
+       hash = hash_str(name);
 
        hash_for_each_possible(sym_hashtable, symbol, node, hash) {
                if (symbol->name &&

diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c
index 50698fff5b9d6da69bf1a7e7dd84dd7f0f4df20a..5cdcee144b58126dcfab50fd709be9fc40e99423 100644 (file)
--- a/scripts/kconfig/util.c
+++ b/scripts/kconfig/util.c
@@ -8,20 +8,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <hash.h>
 #include <hashtable.h>
 #include <xalloc.h>
 #include "lkc.h"
 
-unsigned int strhash(const char *s)
-{
-       /* fnv32 hash */
-       unsigned int hash = 2166136261U;
-
-       for (; *s; s++)
-               hash = (hash ^ *s) * 0x01000193;
-       return hash;
-}
-
 /* hash table of all parsed Kconfig files */
 static HASHTABLE_DEFINE(file_hashtable, 1U << 11);
 
@@ -35,7 +26,7 @@ const char *file_lookup(const char *name)
 {
        struct file *file;
        size_t len;
-       int hash = strhash(name);
+       int hash = hash_str(name);
 
        hash_for_each_possible(file_hashtable, file, node, hash)
                if (!strcmp(name, file->name))