commit 908b01940959be5e3b25e6e352b4bdcb2a49f65c from: Stefan Sperling date: Mon Feb 12 20:29:08 2018 UTC move struct got_zstream_buf to private header zb.h commit - f934cf2c63fe7f1b40d3c217c01a8c6b6556e670 commit + 908b01940959be5e3b25e6e352b4bdcb2a49f65c blob - 7926d579671de282543c40cfd7061b6a535d71ce blob + 12c26ba164146ecbebea3eb36396764616cc5da2 --- include/got_object.h +++ include/got_object.h @@ -14,16 +14,6 @@ * 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 -}; - struct got_object_id { u_int8_t sha1[SHA1_DIGEST_LENGTH]; }; blob - d9ff8c0898d627f34404689ba378093081a3fa8e blob + 9e483cc3b205fa699fa54d75cc474e3980cd8383 --- lib/object.c +++ lib/object.c @@ -32,8 +32,8 @@ #include "got_sha1.h" #include "pack.h" #include "delta.h" -#include "object.h" #include "zb.h" +#include "object.h" #ifndef MIN #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b)) blob - 3098ee5298760506e297b4c3fcc5fa9a041e5dc2 blob + 5d175817858e5ee004febc11be3bd348af23ee47 --- lib/pack.c +++ lib/pack.c @@ -36,8 +36,8 @@ #include "pack.h" #include "path.h" #include "delta.h" -#include "object.h" #include "zb.h" +#include "object.h" #define GOT_PACK_PREFIX "pack-" #define GOT_PACKFILE_SUFFIX ".pack" blob - 0796cc6d464990c0391e413c8aff1f8988c4796b blob + 083cd850bccb87b8f71244429cd970ba60b9ead0 --- lib/zb.h +++ lib/zb.h @@ -14,6 +14,16 @@ * 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 *);