commit - a76a38d94e01aee74bea1e13c38979f9d2214291
commit + 5677e194b16f497f2450d3468248f557068e7f05
blob - 7ad143b579db4f5af8bf72cf84c742d0c18edb3c
blob + d6d844f392eb427a8383b358fdb19c26d6f9c7c8
--- lib/delta.c
+++ lib/delta.c
@@ -28,7 +28,7 @@
 
 #include "got_delta_priv.h"
 #include "got_path_priv.h"
-#include "got_zb_priv.h"
+#include "got_zbuf_priv.h"
 
 #ifndef MIN
 #define	MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
blob - 083cd850bccb87b8f71244429cd970ba60b9ead0 (mode 644)
blob + /dev/null
--- lib/got_zb_priv.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
- *
- * Permission to use, copy, modify, and 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.
- *
- * THE 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.
- */
-
-struct got_zstream_buf {
-	z_stream z;
-	char *inbuf;
-	size_t inlen;
-	char *outbuf;
-	size_t outlen;
-	int flags;
-#define GOT_ZSTREAM_F_HAVE_MORE 0x01
-};
-
-const struct got_error *got_inflate_init(struct got_zstream_buf *, size_t);
-const struct got_error *got_inflate_read(struct got_zstream_buf *, FILE *,
-    size_t *);
-void got_inflate_end(struct got_zstream_buf *);
-const struct got_error *got_inflate_to_mem(uint8_t **, size_t *, FILE *);
-const struct got_error *got_inflate_to_file(size_t *, FILE *, FILE *);
blob - /dev/null
blob + 083cd850bccb87b8f71244429cd970ba60b9ead0 (mode 644)
--- /dev/null
+++ lib/got_zbuf_priv.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
+ *
+ * Permission to use, copy, modify, and 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.
+ *
+ * THE 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.
+ */
+
+struct got_zstream_buf {
+	z_stream z;
+	char *inbuf;
+	size_t inlen;
+	char *outbuf;
+	size_t outlen;
+	int flags;
+#define GOT_ZSTREAM_F_HAVE_MORE 0x01
+};
+
+const struct got_error *got_inflate_init(struct got_zstream_buf *, size_t);
+const struct got_error *got_inflate_read(struct got_zstream_buf *, FILE *,
+    size_t *);
+void got_inflate_end(struct got_zstream_buf *);
+const struct got_error *got_inflate_to_mem(uint8_t **, size_t *, FILE *);
+const struct got_error *got_inflate_to_file(size_t *, FILE *, FILE *);
blob - 840d8edeebd6866c6c5007592f9aa48af8305111
blob + 7ad3fb7759ba0aecadda6ae00f5db282079a8911
--- lib/object.c
+++ lib/object.c
@@ -33,7 +33,7 @@
 #include "got_sha1_priv.h"
 #include "got_delta_priv.h"
 #include "got_pack_priv.h"
-#include "got_zb_priv.h"
+#include "got_zbuf_priv.h"
 #include "got_object_priv.h"
 
 #ifndef MIN
blob - bc309b7af7264c10cff531e9e9240bae59644866
blob + a81848627d0d3dd80e1e7f20bd2a0078817e63bf
--- lib/pack.c
+++ lib/pack.c
@@ -37,7 +37,7 @@
 #include "got_pack_priv.h"
 #include "got_path_priv.h"
 #include "got_delta_priv.h"
-#include "got_zb_priv.h"
+#include "got_zbuf_priv.h"
 #include "got_object_priv.h"
 #include "got_repository_priv.h"
 
blob - cf430093182bde3f14d1df3bc5063b8c9f6819f5
blob + 7ea9289bf339c1c16c8dcb23112bdce4702527ae
--- lib/refs.c
+++ lib/refs.c
@@ -32,7 +32,7 @@
 #include "got_sha1_priv.h"
 #include "got_path_priv.h"
 #include "got_delta_priv.h"
-#include "got_zb_priv.h"
+#include "got_zbuf_priv.h"
 #include "got_object_priv.h"
 
 /* A symbolic reference. */
blob - ac7b356c73e492aea73ce81178afb0ddd399972d
blob + 1a6fd7b08f4f431dd12a997009a65c6f0bf706f8
--- lib/repository.c
+++ lib/repository.c
@@ -29,7 +29,7 @@
 
 #include "got_path_priv.h"
 #include "got_repository_priv.h"
-#include "got_zb_priv.h"
+#include "got_zbuf_priv.h"
 #include "got_delta_priv.h"
 #include "got_object_priv.h"
 #include "got_pack_priv.h"
blob - 0b27e5b0b969460a111f3e967b488e6c5629add7
blob + a7a5db2a6d6f5fc05e1a82976133453c119a03ea
--- lib/zbuf.c
+++ lib/zbuf.c
@@ -26,7 +26,7 @@
 #include "got_object.h"
 
 #include "got_path_priv.h"
-#include "got_zb_priv.h"
+#include "got_zbuf_priv.h"
 
 const struct got_error *
 got_inflate_init(struct got_zstream_buf *zb, size_t bufsize)