Move hash implementation to shared directory

diff --git a/Makefile.am b/Makefile.am
index 7f65e315edca9e7c3d7c897e3a55d2228e969508..4971be4a4d06652f22093bad9a3445b852fb28a1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,10 +48,10 @@ libkmod_libkmod_util_la_SOURCES = \
        shared/missing.h \
        shared/array.c \
        shared/array.h \
+       shared/hash.c \
+       shared/hash.h \
        shared/util.c \
        shared/util.h \
-       libkmod/libkmod-hash.c \
-       libkmod/libkmod-hash.h \
        libkmod/libkmod-util.c \
        libkmod/libkmod-util.h
 

diff --git a/libkmod/docs/Makefile.am b/libkmod/docs/Makefile.am
index 1fd6b900c8adc0d43b50403e4e7f772588bd899a..cd3bb162e87ffd7d0e27f970841b5a109d192cb5 100644 (file)
--- a/libkmod/docs/Makefile.am
+++ b/libkmod/docs/Makefile.am
@@ -22,7 +22,6 @@ CFILE_GLOB = $(top_srcdir)/libkmod/libkmod.c $(top_srcdir)/libkmod/libkmod-modul
 
 IGNORE_HFILES = libkmod-internal.h \
                libkmod-util.h \
-               libkmod-hash.h \
                libkmod-index.h
 
 content_files = version.xml

diff --git a/libkmod/libkmod-internal.h b/libkmod/libkmod-internal.h
index 79f1a136ce3868d1abac46edc3459d896b79450e..83a5bc2f3debbaa751f0f8d669efe6d6ed0a7bda 100644 (file)
--- a/libkmod/libkmod-internal.h
+++ b/libkmod/libkmod-internal.h
@@ -146,9 +146,6 @@ void kmod_module_set_visited(struct kmod_module *mod, bool visited) __attribute_
 void kmod_module_set_builtin(struct kmod_module *mod, bool builtin) __attribute__((nonnull((1))));
 void kmod_module_set_required(struct kmod_module *mod, bool required) __attribute__((nonnull(1)));
 
-/* libkmod-hash.c */
-
-#include "libkmod-hash.h"
 
 /* libkmod-file.c */
 struct kmod_file *kmod_file_open(const struct kmod_ctx *ctx, const char *filename) _must_check_ __attribute__((nonnull(1,2)));

diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
index 89d70c3e5bf4d2646b6b991df2b334a7b3b619ae..3dc5a2b4b73e2fd59e8eff46c351a96ac51b6471 100644 (file)
--- a/libkmod/libkmod.c
+++ b/libkmod/libkmod.c
@@ -32,6 +32,7 @@
 #include <sys/utsname.h>
 #include <sys/stat.h>
 
+#include <shared/hash.h>
 #include <shared/util.h>
 
 #include "libkmod.h"

diff --git a/libkmod/libkmod-hash.c b/shared/hash.c
similarity index 99%
rename from libkmod/libkmod-hash.c
rename to shared/hash.c
index 9b4d1f18db65416194be5d377b5e571518fd32ef..d2f5a7892356c3eeb11911c23e42562ca8a76f37 100644 (file)
--- a/libkmod/libkmod-hash.c
+++ b/shared/hash.c
@@ -18,16 +18,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <shared/util.h>
-
-#include "libkmod.h"
-#include "libkmod-hash.h"
-
-#include "libkmod-util.h"
+#include <inttypes.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 
+#include <shared/hash.h>
+#include <shared/util.h>
+
 struct hash_entry {
        const char *key;
        const void *value;

diff --git a/libkmod/libkmod-hash.h b/shared/hash.h
similarity index 100%
rename from libkmod/libkmod-hash.h
rename to shared/hash.h

diff --git a/testsuite/test-hash.c b/testsuite/test-hash.c
index 110c4d17172e5560305e790ba251835e77a22f45..61260d9c624aee1a5aee86602b5f30841b440c85 100644 (file)
--- a/testsuite/test-hash.c
+++ b/testsuite/test-hash.c
@@ -23,7 +23,8 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include <libkmod-hash.h>
+#include <shared/hash.h>
+
 #include "testsuite.h"
 
 static int freecount;

diff --git a/tools/depmod.c b/tools/depmod.c
index e1e08f6713c394e389a4abceeb1e34fc8cb19814..69c3f3f07a46a9caa534e4e6e2fa1d527f7dceb2 100644 (file)
--- a/tools/depmod.c
+++ b/tools/depmod.c
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "libkmod.h"
-#include "libkmod-hash.h"
 #include "libkmod-util.h"
 
 #include <shared/array.h>
+#include <shared/hash.h>
 #include <shared/macro.h>
 #include <shared/util.h>