Remove ZixChunk

4 files changed, 19 insertions, 86 deletions

diff --git a/benchmark/dict_bench.c b/benchmark/dict_bench.c
index 5d849d6..6d6b8d4 100644
--- a/benchmark/dict_bench.c
+++ b/benchmark/dict_bench.c
@@ -17,8 +17,8 @@
 #include "bench.h"
 #include "warnings.h"
 
-#include "zix/chunk.h"
 #include "zix/common.h"
+#include "zix/digest.h"
 #include "zix/hash.h"
 
 ZIX_DISABLE_GLIB_WARNINGS
@@ -27,11 +27,29 @@ ZIX_RESTORE_WARNINGS
 
 #include <ctype.h>
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
+typedef struct {
+  void*  buf;
+  size_t len;
+} ZixChunk;
+
+static uint32_t
+zix_chunk_hash(const ZixChunk* const chunk)
+{
+  return zix_digest_add(zix_digest_start(), chunk->buf, chunk->len);
+}
+
+static bool
+zix_chunk_equal(const ZixChunk* a, const ZixChunk* b)
+{
+  return a->len == b->len && !memcmp(a->buf, b->buf, a->len);
+}
+
 static const unsigned seed = 1;
 
 ZIX_LOG_FUNC(1, 2)
diff --git a/include/zix/chunk.h b/include/zix/chunk.h
deleted file mode 100644
index 3646718..0000000
--- a/include/zix/chunk.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-  Copyright 2012 David Robillard <http://drobilla.net>
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-
-#ifndef ZIX_CHUNK_H
-#define ZIX_CHUNK_H
-
-#include "zix/common.h"
-
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
-   A chunk of memory.
-*/
-typedef struct {
-  void*  buf; /**< Start of memory chunk */
-  size_t len; /**< Length of memory chunk */
-} ZixChunk;
-
-ZIX_PURE_API
-uint32_t
-zix_chunk_hash(const ZixChunk* chunk);
-
-ZIX_PURE_API
-bool
-zix_chunk_equal(const ZixChunk* a, const ZixChunk* b);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* ZIX_CHUNK_H */
diff --git a/meson.build b/meson.build
index 4babf8c..0ab9a01 100644
--- a/meson.build
+++ b/meson.build
@@ -173,7 +173,6 @@ endif
 sources = [
   'src/bitset.c',
   'src/btree.c',
-  'src/chunk.c',
   'src/digest.c',
   'src/hash.c',
   'src/ring.c',
@@ -211,7 +210,6 @@ pkg.generate(
 headers = [
   'include/zix/bitset.h',
   'include/zix/btree.h',
-  'include/zix/chunk.h',
   'include/zix/common.h',
   'include/zix/digest.h',
   'include/zix/hash.h',
diff --git a/src/chunk.c b/src/chunk.c
deleted file mode 100644
index bf80f88..0000000
--- a/src/chunk.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-  Copyright 2012 David Robillard <http://drobilla.net>
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-
-#include "zix/chunk.h"
-
-#include "zix/digest.h"
-
-#include <string.h>
-
-uint32_t
-zix_chunk_hash(const ZixChunk* const chunk)
-{
-  return zix_digest_add(zix_digest_start(), chunk->buf, chunk->len);
-}
-
-bool
-zix_chunk_equal(const ZixChunk* a, const ZixChunk* b)
-{
-  return a->len == b->len && !memcmp(a->buf, b->buf, a->len);
-}