commit 2256993b27260cd7860c34b47751dff21a7083a8
from: Stefan Sperling <stsp@stsp.name>
date: Mon Jul 15 10:50:29 2019 UTC

avoid dependency on delta.o in binaries which don't need it

commit - 3ce1b84566a5dc6cbbfcfc87507aa84de4f0c9b9
commit + 2256993b27260cd7860c34b47751dff21a7083a8
blob - 2bed5349b29f99b725d2d2023834eb1bf00a304f
blob + 42f628d13edc1ddbaa6844b6156d41a9438d9e4b
--- lib/delta.c
+++ lib/delta.c
@@ -58,13 +58,6 @@ got_delta_open(off_t offset, size_t tslen, int type, s
 	return delta;
 }
 
-void
-got_delta_close(struct got_delta *delta)
-{
-	free(delta->delta_buf);
-	free(delta);
-}
-
 const struct got_error *
 got_delta_chain_get_base_type(int *type, struct got_delta_chain *deltas)
 {
blob - a2cb4a3ab0d26620028ba99100ba2d73563520c9
blob + 8b79413858bc4609d31a7e5b7910f8419f709365
--- lib/got_lib_delta.h
+++ lib/got_lib_delta.h
@@ -34,7 +34,6 @@ struct got_delta_chain {
 
 struct got_delta *got_delta_open(off_t, size_t, int, size_t, off_t,
     uint8_t *, size_t);
-void got_delta_close(struct got_delta *);
 const struct got_error *got_delta_chain_get_base_type(int *,
     struct got_delta_chain *);
 const struct got_error *got_delta_get_sizes(uint64_t *, uint64_t *,
blob - d924810f4b5a46d8e58241ff8120b186f60fea41
blob + 75a7a670ac1543d7b248a86780f3996aae0c413a
--- lib/object_parse.c
+++ lib/object_parse.c
@@ -113,7 +113,8 @@ got_object_close(struct got_object *obj)
 		while (!SIMPLEQ_EMPTY(&obj->deltas.entries)) {
 			delta = SIMPLEQ_FIRST(&obj->deltas.entries);
 			SIMPLEQ_REMOVE_HEAD(&obj->deltas.entries, entry);
-			got_delta_close(delta);
+			free(delta->delta_buf);
+			free(delta);
 		}
 	}
 	if (obj->flags & GOT_OBJ_FLAG_PACKED)
blob - ad08409fc2e23e3dc1b5981b4e80df3ae5d993e2
blob + a946ea4cb3c4af22d2b0d696b5d36216b4cbd51d
--- libexec/got-read-blob/Makefile
+++ libexec/got-read-blob/Makefile
@@ -1,7 +1,7 @@
 .PATH:${.CURDIR}/../../lib
 
 PROG=		got-read-blob
-SRCS=		got-read-blob.c delta.c error.c inflate.c object_parse.c \
+SRCS=		got-read-blob.c error.c inflate.c object_parse.c \
 		path.c privsep.c sha1.c
 
 CPPFLAGS = -I${.CURDIR}/../../include -I${.CURDIR}/../../lib
blob - 2786410a5e3bf8c17f1cc1ed97f8d3a816d6019d
blob + c08ff1e7723415a5ac1f9ea74c0f82bab9430ebf
--- libexec/got-read-commit/Makefile
+++ libexec/got-read-commit/Makefile
@@ -1,7 +1,7 @@
 .PATH:${.CURDIR}/../../lib
 
 PROG=		got-read-commit
-SRCS=		got-read-commit.c delta.c error.c inflate.c object_parse.c \
+SRCS=		got-read-commit.c error.c inflate.c object_parse.c \
 		path.c privsep.c sha1.c
 
 CPPFLAGS = -I${.CURDIR}/../../include -I${.CURDIR}/../../lib
blob - da7839de46ae66d80033b36e43ab1d71ef5cb5bd
blob + 59363930d712bcb75c16d5bfda5f3994e77ae934
--- libexec/got-read-object/Makefile
+++ libexec/got-read-object/Makefile
@@ -1,7 +1,7 @@
 .PATH:${.CURDIR}/../../lib
 
 PROG=		got-read-object
-SRCS=		got-read-object.c delta.c error.c inflate.c object_parse.c \
+SRCS=		got-read-object.c error.c inflate.c object_parse.c \
 		path.c privsep.c sha1.c
 
 CPPFLAGS = -I${.CURDIR}/../../include -I${.CURDIR}/../../lib
blob - 3526b16aa7afcffb537e6b7d1110a318df7d1e9e
blob + 0d2ce55b532d6eaaf8eae9b19cc5750c60ea8938
--- libexec/got-read-tag/Makefile
+++ libexec/got-read-tag/Makefile
@@ -1,7 +1,7 @@
 .PATH:${.CURDIR}/../../lib
 
 PROG=		got-read-tag
-SRCS=		got-read-tag.c delta.c error.c inflate.c object_parse.c \
+SRCS=		got-read-tag.c error.c inflate.c object_parse.c \
 		path.c privsep.c sha1.c
 
 CPPFLAGS = -I${.CURDIR}/../../include -I${.CURDIR}/../../lib
blob - 2d7e641e43c40642e073f9c044684b8c07e674c3
blob + 829da95ed8c2c387f7db966f20c68c20de2c95c9
--- libexec/got-read-tree/Makefile
+++ libexec/got-read-tree/Makefile
@@ -1,7 +1,7 @@
 .PATH:${.CURDIR}/../../lib
 
 PROG=		got-read-tree
-SRCS=		got-read-tree.c delta.c error.c inflate.c object_parse.c \
+SRCS=		got-read-tree.c error.c inflate.c object_parse.c \
 		path.c privsep.c sha1.c
 
 CPPFLAGS = -I${.CURDIR}/../../include -I${.CURDIR}/../../lib
blob - 9b1d3ab6c454653ad6ec61e945b888fffb7e49d0
blob + 3783d353f0ba9f27a5cb053c8ed7b17f0d6015c6
--- regress/idset/Makefile
+++ regress/idset/Makefile
@@ -1,11 +1,7 @@
 .PATH:${.CURDIR}/../../lib
 
 PROG = idset_test
-SRCS = error.c object.c privsep.c sha1.c pack.c inflate.c path.c opentemp.c \
-	delta.c repository.c reference.c worktree.c fileindex.c object_cache.c \
-	object_idset.c object_parse.c idset_test.c \
-	buf.c worklist.c rcsutil.c diff.c diffreg.c diff3.c lockfile.c \
-	deflate.c object_create.c
+SRCS = error.c sha1.c object_idset.c inflate.c object_parse.c idset_test.c
 
 CPPFLAGS = -I${.CURDIR}/../../include -I${.CURDIR}/../../lib
 LDADD = -lutil -lz