aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-05-19 16:17:29 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-05-19 16:17:29 +0200
commit98b660135e142371431759c2a52a6ecb5457bb0d (patch)
treed6916dd52008e4cb05e9baa448da61e2638eb34e
parent692cbd0079658a8eb048c9b00dadec2d69d28b14 (diff)
Cleanup: move hash table header to include directory
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
-rw-r--r--COPYING.md6
-rw-r--r--include/hash_table.h (renamed from lib/util/hash_table.h)0
-rw-r--r--lib/sqfs/Makemodule.am2
-rw-r--r--lib/sqfs/frag_table.c2
-rw-r--r--lib/util/Makemodule.am4
5 files changed, 7 insertions, 7 deletions
diff --git a/COPYING.md b/COPYING.md
index 0d2aa0c..d27ddaa 100644
--- a/COPYING.md
+++ b/COPYING.md
@@ -14,9 +14,9 @@ with the following exceptions:
- `lib/sqfs/comp/zlib` contains files that have been extracted from the the
zlib compression library and modified. See `lib/sqfs/comp/zlib/README` for
details and `licenses/zlib.txt` for details.
- - `lib/util/hash_table.*` and `lib/util/fast_urem_by_const.h` contain a hash
- table implementation (MIT license). See `licenses/hash_table.txt` for
- details.
+ - `lib/util/hash_table.c`, `include/hash_table.h` and
+ `lib/util/fast_urem_by_const.h` contain a hash table implementation (MIT
+ license). See `licenses/hash_table.txt` for details.
The rest of squashfs-tools-ng is released under the terms and conditions of
the **GNU General Public License version 3 or later**.
diff --git a/lib/util/hash_table.h b/include/hash_table.h
index ccbd9c0..ccbd9c0 100644
--- a/lib/util/hash_table.h
+++ b/include/hash_table.h
diff --git a/lib/sqfs/Makemodule.am b/lib/sqfs/Makemodule.am
index 32b4c25..fffa502 100644
--- a/lib/sqfs/Makemodule.am
+++ b/lib/sqfs/Makemodule.am
@@ -36,7 +36,7 @@ libsquashfs_la_LIBADD += $(ZSTD_LIBS) $(PTHREAD_LIBS)
# directly "import" stuff from libutil
libsquashfs_la_SOURCES += lib/util/str_table.c lib/util/alloc.c
libsquashfs_la_SOURCES += lib/util/xxhash.c
-libsquashfs_la_SOURCES += lib/util/hash_table.c lib/util/hash_table.h
+libsquashfs_la_SOURCES += lib/util/hash_table.c include/hash_table.h
if WINDOWS
libsquashfs_la_SOURCES += lib/sqfs/win32/io_file.c
diff --git a/lib/sqfs/frag_table.c b/lib/sqfs/frag_table.c
index 59811bb..366cb85 100644
--- a/lib/sqfs/frag_table.c
+++ b/lib/sqfs/frag_table.c
@@ -14,7 +14,7 @@
#include "sqfs/block.h"
#include "compat.h"
-#include "lib/util/hash_table.h"
+#include "hash_table.h"
#include <stdlib.h>
#include <string.h>
diff --git a/lib/util/Makemodule.am b/lib/util/Makemodule.am
index 70a11c1..68f5e8d 100644
--- a/lib/util/Makemodule.am
+++ b/lib/util/Makemodule.am
@@ -1,8 +1,8 @@
-libutil_a_SOURCES = include/util.h include/str_table.h
+libutil_a_SOURCES = include/util.h include/str_table.h include/hash_table.h
libutil_a_SOURCES += lib/util/str_table.c lib/util/alloc.c
libutil_a_SOURCES += lib/util/rbtree.c include/rbtree.h
libutil_a_SOURCES += lib/util/xxhash.c lib/util/hash_table.c
-libutil_a_SOURCES += lib/util/hash_table.h lib/util/fast_urem_by_const.h
+libutil_a_SOURCES += lib/util/fast_urem_by_const.h
libutil_a_CFLAGS = $(AM_CFLAGS)
libutil_a_CPPFLAGS = $(AM_CPPFLAGS)