reftable/basics: merge "publicbasics" into "basics"

The split between "basics" and "publicbasics" is somewhat arbitrary and
not in line with how we typically structure code in the reftable
library. While we do indeed split up headers into a public and internal
part, we don't do that for the compilation unit itself. Furthermore, the
declarations for "publicbasics.c" are in "reftable-malloc.h", which
isn't in line with our naming schema, either.

Fix these inconsistencies by:

  - Merging "publicbasics.c" into "basics.c".

  - Renaming "reftable-malloc.h" to "reftable-basics.h" as the public
    header.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Makefile b/Makefile
index e3abf0ba83149bcea1a8d6f7edaae7a9bf8e051c..39b10923d494e1f2c8b49a426aa012efca4f990e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2683,7 +2683,6 @@ REFTABLE_OBJS += reftable/error.o
 REFTABLE_OBJS += reftable/block.o
 REFTABLE_OBJS += reftable/blocksource.o
 REFTABLE_OBJS += reftable/iter.o
-REFTABLE_OBJS += reftable/publicbasics.o
 REFTABLE_OBJS += reftable/merged.o
 REFTABLE_OBJS += reftable/pq.o
 REFTABLE_OBJS += reftable/reader.o

diff --git a/reftable/basics.c b/reftable/basics.c
index 0058619ca6742ae29b4f50d7188b0fc19d87f45b..cf072935c88060310ff1c5f189d0f3f8dc7ba4ea 100644 (file)
--- a/reftable/basics.c
+++ b/reftable/basics.c
@@ -7,6 +7,49 @@ https://developers.google.com/open-source/licenses/bsd
 */
 
 #include "basics.h"
+#include "reftable-basics.h"
+
+static void *(*reftable_malloc_ptr)(size_t sz);
+static void *(*reftable_realloc_ptr)(void *, size_t);
+static void (*reftable_free_ptr)(void *);
+
+void *reftable_malloc(size_t sz)
+{
+       if (reftable_malloc_ptr)
+               return (*reftable_malloc_ptr)(sz);
+       return malloc(sz);
+}
+
+void *reftable_realloc(void *p, size_t sz)
+{
+       if (reftable_realloc_ptr)
+               return (*reftable_realloc_ptr)(p, sz);
+       return realloc(p, sz);
+}
+
+void reftable_free(void *p)
+{
+       if (reftable_free_ptr)
+               reftable_free_ptr(p);
+       else
+               free(p);
+}
+
+void *reftable_calloc(size_t nelem, size_t elsize)
+{
+       size_t sz = st_mult(nelem, elsize);
+       void *p = reftable_malloc(sz);
+       memset(p, 0, sz);
+       return p;
+}
+
+void reftable_set_alloc(void *(*malloc)(size_t),
+                       void *(*realloc)(void *, size_t), void (*free)(void *))
+{
+       reftable_malloc_ptr = malloc;
+       reftable_realloc_ptr = realloc;
+       reftable_free_ptr = free;
+}
 
 void put_be24(uint8_t *out, uint32_t i)
 {
@@ -121,3 +164,15 @@ int common_prefix_size(struct strbuf *a, struct strbuf *b)
 
        return p;
 }
+
+int hash_size(uint32_t id)
+{
+       switch (id) {
+       case 0:
+       case GIT_SHA1_FORMAT_ID:
+               return GIT_SHA1_RAWSZ;
+       case GIT_SHA256_FORMAT_ID:
+               return GIT_SHA256_RAWSZ;
+       }
+       abort();
+}

diff --git a/reftable/basics.h b/reftable/basics.h
index c8fec68d4e887e24b793cac656e2f34d0c93635f..4e2e76014aa761560879fe0a6bdd8866fa075fa3 100644 (file)
--- a/reftable/basics.h
+++ b/reftable/basics.h
@@ -14,6 +14,7 @@ https://developers.google.com/open-source/licenses/bsd
  */
 
 #include "system.h"
+#include "reftable-basics.h"
 
 /* Bigendian en/decoding of integers */
 
@@ -71,4 +72,6 @@ void *reftable_calloc(size_t nelem, size_t elsize);
 struct strbuf;
 int common_prefix_size(struct strbuf *a, struct strbuf *b);
 
+int hash_size(uint32_t id);
+
 #endif

diff --git a/reftable/publicbasics.c b/reftable/publicbasics.c
deleted file mode 100644 (file)
index 44b84a1..0000000
--- a/reftable/publicbasics.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-Copyright 2020 Google LLC
-
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file or at
-https://developers.google.com/open-source/licenses/bsd
-*/
-
-#include "system.h"
-#include "reftable-malloc.h"
-
-#include "basics.h"
-
-static void *(*reftable_malloc_ptr)(size_t sz);
-static void *(*reftable_realloc_ptr)(void *, size_t);
-static void (*reftable_free_ptr)(void *);
-
-void *reftable_malloc(size_t sz)
-{
-       if (reftable_malloc_ptr)
-               return (*reftable_malloc_ptr)(sz);
-       return malloc(sz);
-}
-
-void *reftable_realloc(void *p, size_t sz)
-{
-       if (reftable_realloc_ptr)
-               return (*reftable_realloc_ptr)(p, sz);
-       return realloc(p, sz);
-}
-
-void reftable_free(void *p)
-{
-       if (reftable_free_ptr)
-               reftable_free_ptr(p);
-       else
-               free(p);
-}
-
-void *reftable_calloc(size_t nelem, size_t elsize)
-{
-       size_t sz = st_mult(nelem, elsize);
-       void *p = reftable_malloc(sz);
-       memset(p, 0, sz);
-       return p;
-}
-
-void reftable_set_alloc(void *(*malloc)(size_t),
-                       void *(*realloc)(void *, size_t), void (*free)(void *))
-{
-       reftable_malloc_ptr = malloc;
-       reftable_realloc_ptr = realloc;
-       reftable_free_ptr = free;
-}
-
-int hash_size(uint32_t id)
-{
-       switch (id) {
-       case 0:
-       case GIT_SHA1_FORMAT_ID:
-               return GIT_SHA1_RAWSZ;
-       case GIT_SHA256_FORMAT_ID:
-               return GIT_SHA256_RAWSZ;
-       }
-       abort();
-}

diff --git a/reftable/reftable-basics.h b/reftable/reftable-basics.h
new file mode 100644 (file)
index 0000000..6e8e636
--- /dev/null
+++ b/reftable/reftable-basics.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file or at
+ * https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef REFTABLE_BASICS_H
+#define REFTABLE_BASICS_H
+
+#include <stddef.h>
+
+/* Overrides the functions to use for memory management. */
+void reftable_set_alloc(void *(*malloc)(size_t),
+                       void *(*realloc)(void *, size_t), void (*free)(void *));
+
+#endif

diff --git a/reftable/reftable-malloc.h b/reftable/reftable-malloc.h
deleted file mode 100644 (file)
index 5f2185f..0000000
--- a/reftable/reftable-malloc.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 Google LLC
-
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file or at
-https://developers.google.com/open-source/licenses/bsd
-*/
-
-#ifndef REFTABLE_H
-#define REFTABLE_H
-
-#include <stddef.h>
-
-/* Overrides the functions to use for memory management. */
-void reftable_set_alloc(void *(*malloc)(size_t),
-                       void *(*realloc)(void *, size_t), void (*free)(void *));
-
-#endif