Commit 5677e194b16f497f2450d3468248f557068e7f05
2018-03-11T13:20:25
rename got_zb_priv.h to got_zbuf_priv.h
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154
diff --git a/lib/delta.c b/lib/delta.c
index 7ad143b..d6d844f 100644
--- a/lib/delta.c
+++ b/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))
diff --git a/lib/got_zb_priv.h b/lib/got_zb_priv.h
deleted file mode 100644
index 083cd85..0000000
--- a/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 *);
diff --git a/lib/got_zbuf_priv.h b/lib/got_zbuf_priv.h
new file mode 100644
index 0000000..083cd85
--- /dev/null
+++ b/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 *);
diff --git a/lib/object.c b/lib/object.c
index 840d8ed..7ad3fb7 100644
--- a/lib/object.c
+++ b/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
diff --git a/lib/pack.c b/lib/pack.c
index bc309b7..a818486 100644
--- a/lib/pack.c
+++ b/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"
diff --git a/lib/refs.c b/lib/refs.c
index cf43009..7ea9289 100644
--- a/lib/refs.c
+++ b/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. */
diff --git a/lib/repository.c b/lib/repository.c
index ac7b356..1a6fd7b 100644
--- a/lib/repository.c
+++ b/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"
diff --git a/lib/zbuf.c b/lib/zbuf.c
index 0b27e5b..a7a5db2 100644
--- a/lib/zbuf.c
+++ b/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)