bundle.h: make "fd" version of read_bundle_header() public

Change the parse_bundle_header() function to be non-static, and rename
it to parse_bundle_header_fd(). The parse_bundle_header() function is
already public, and it's a thin wrapper around this function. This
will be used by code that wants to pass a fd to the bundle API.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/bundle.c b/bundle.c
index d50cfb5aa7e9c28afc121f9bf27499518a3fee37..5fa41a52f110ef3104ed4553a01e1d40dc2bd549 100644 (file)
--- a/bundle.c
+++ b/bundle.c
@@ -66,8 +66,8 @@ static int parse_bundle_signature(struct bundle_header *header, const char *line
        return -1;
 }
 
-static int parse_bundle_header(int fd, struct bundle_header *header,
-                              const char *report_path)
+int read_bundle_header_fd(int fd, struct bundle_header *header,
+                         const char *report_path)
 {
        struct strbuf buf = STRBUF_INIT;
        int status = 0;
@@ -143,7 +143,7 @@ int read_bundle_header(const char *path, struct bundle_header *header)
 
        if (fd < 0)
                return error(_("could not open '%s'"), path);
-       return parse_bundle_header(fd, header, path);
+       return read_bundle_header_fd(fd, header, path);
 }
 
 int is_bundle(const char *path, int quiet)
@@ -153,7 +153,7 @@ int is_bundle(const char *path, int quiet)
 
        if (fd < 0)
                return 0;
-       fd = parse_bundle_header(fd, &header, quiet ? NULL : path);
+       fd = read_bundle_header_fd(fd, &header, quiet ? NULL : path);
        if (fd >= 0)
                close(fd);
        bundle_header_release(&header);

diff --git a/bundle.h b/bundle.h
index 7fef2108f436861726ca4efb6937f9d434e61d7e..0c052f54964f110688c6b2edf02f4c7dfca8a623 100644 (file)
--- a/bundle.h
+++ b/bundle.h
@@ -24,6 +24,8 @@ void bundle_header_release(struct bundle_header *header);
 
 int is_bundle(const char *path, int quiet);
 int read_bundle_header(const char *path, struct bundle_header *header);
+int read_bundle_header_fd(int fd, struct bundle_header *header,
+                         const char *report_path);
 int create_bundle(struct repository *r, const char *path,
                  int argc, const char **argv, struct strvec *pack_options,
                  int version);