archive: convert write_archive_entry_fn_t to object_id

Convert the write_archive_entry_fn_t type to use a pointer to struct
object_id.  Convert various static functions in the tar and zip
archivers also.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/archive-tar.c b/archive-tar.c
index c6ed96ee74ec10f5c9ffb6f520193326d4704b6b..24b1ccef3af472c2e4de2f35a805b84be0ea5478 100644 (file)
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -111,7 +111,7 @@ static void write_trailer(void)
  * queues up writes, so that all our write(2) calls write exactly one
  * full block; pads writes to RECORDSIZE
  */
  * queues up writes, so that all our write(2) calls write exactly one
  * full block; pads writes to RECORDSIZE
  */

-static int stream_blocked(const unsigned char *sha1)
+static int stream_blocked(const struct object_id *oid)

 {
        struct git_istream *st;
        enum object_type type;
 {
        struct git_istream *st;
        enum object_type type;


@@ -119,9 +119,9 @@ static int stream_blocked(const unsigned char *sha1)
        char buf[BLOCKSIZE];
        ssize_t readlen;
 
        char buf[BLOCKSIZE];
        ssize_t readlen;
 

-       st = open_istream(sha1, &type, &sz, NULL);
+       st = open_istream(oid->hash, &type, &sz, NULL);

        if (!st)
        if (!st)

-               return error("cannot stream blob %s", sha1_to_hex(sha1));
+               return error("cannot stream blob %s", oid_to_hex(oid));

        for (;;) {
                readlen = read_istream(st, buf, sizeof(buf));
                if (readlen <= 0)
        for (;;) {
                readlen = read_istream(st, buf, sizeof(buf));
                if (readlen <= 0)


@@ -218,7 +218,7 @@ static void prepare_header(struct archiver_args *args,
 }
 
 static void write_extended_header(struct archiver_args *args,
 }
 
 static void write_extended_header(struct archiver_args *args,

-                                 const unsigned char *sha1,
+                                 const struct object_id *oid,

                                  const void *buffer, unsigned long size)
 {
        struct ustar_header header;
                                  const void *buffer, unsigned long size)
 {
        struct ustar_header header;


@@ -226,14 +226,14 @@ static void write_extended_header(struct archiver_args *args,
        memset(&header, 0, sizeof(header));
        *header.typeflag = TYPEFLAG_EXT_HEADER;
        mode = 0100666;
        memset(&header, 0, sizeof(header));
        *header.typeflag = TYPEFLAG_EXT_HEADER;
        mode = 0100666;

-       xsnprintf(header.name, sizeof(header.name), "%s.paxheader", sha1_to_hex(sha1));
+       xsnprintf(header.name, sizeof(header.name), "%s.paxheader", oid_to_hex(oid));

        prepare_header(args, &header, mode, size);
        write_blocked(&header, sizeof(header));
        write_blocked(buffer, size);
 }
 
 static int write_tar_entry(struct archiver_args *args,
        prepare_header(args, &header, mode, size);
        write_blocked(&header, sizeof(header));
        write_blocked(buffer, size);
 }
 
 static int write_tar_entry(struct archiver_args *args,

-                          const unsigned char *sha1,
+                          const struct object_id *oid,

                           const char *path, size_t pathlen,
                           unsigned int mode)
 {
                           const char *path, size_t pathlen,
                           unsigned int mode)
 {


@@ -257,7 +257,7 @@ static int write_tar_entry(struct archiver_args *args,
                mode = (mode | ((mode & 0100) ? 0777 : 0666)) & ~tar_umask;
        } else {
                return error("unsupported file mode: 0%o (SHA1: %s)",
                mode = (mode | ((mode & 0100) ? 0777 : 0666)) & ~tar_umask;
        } else {
                return error("unsupported file mode: 0%o (SHA1: %s)",

-                            mode, sha1_to_hex(sha1));
+                            mode, oid_to_hex(oid));

        }
        if (pathlen > sizeof(header.name)) {
                size_t plen = get_path_prefix(path, pathlen,
        }
        if (pathlen > sizeof(header.name)) {
                size_t plen = get_path_prefix(path, pathlen,


@@ -268,7 +268,7 @@ static int write_tar_entry(struct archiver_args *args,
                        memcpy(header.name, path + plen + 1, rest);
                } else {
                        xsnprintf(header.name, sizeof(header.name), "%s.data",
                        memcpy(header.name, path + plen + 1, rest);
                } else {
                        xsnprintf(header.name, sizeof(header.name), "%s.data",

-                                 sha1_to_hex(sha1));
+                                 oid_to_hex(oid));

                        strbuf_append_ext_header(&ext_header, "path",
                                                 path, pathlen);
                }
                        strbuf_append_ext_header(&ext_header, "path",
                                                 path, pathlen);
                }


@@ -276,14 +276,14 @@ static int write_tar_entry(struct archiver_args *args,
                memcpy(header.name, path, pathlen);
 
        if (S_ISREG(mode) && !args->convert &&
                memcpy(header.name, path, pathlen);
 
        if (S_ISREG(mode) && !args->convert &&

-           sha1_object_info(sha1, &size) == OBJ_BLOB &&
+           sha1_object_info(oid->hash, &size) == OBJ_BLOB &&

            size > big_file_threshold)
                buffer = NULL;
        else if (S_ISLNK(mode) || S_ISREG(mode)) {
                enum object_type type;
            size > big_file_threshold)
                buffer = NULL;
        else if (S_ISLNK(mode) || S_ISREG(mode)) {
                enum object_type type;

-               buffer = sha1_file_to_archive(args, path, sha1, old_mode, &type, &size);
+               buffer = sha1_file_to_archive(args, path, oid->hash, old_mode, &type, &size);

                if (!buffer)
                if (!buffer)

-                       return error("cannot read %s", sha1_to_hex(sha1));
+                       return error("cannot read %s", oid_to_hex(oid));

        } else {
                buffer = NULL;
                size = 0;
        } else {
                buffer = NULL;
                size = 0;


@@ -292,7 +292,7 @@ static int write_tar_entry(struct archiver_args *args,
        if (S_ISLNK(mode)) {
                if (size > sizeof(header.linkname)) {
                        xsnprintf(header.linkname, sizeof(header.linkname),
        if (S_ISLNK(mode)) {
                if (size > sizeof(header.linkname)) {
                        xsnprintf(header.linkname, sizeof(header.linkname),

-                                 "see %s.paxheader", sha1_to_hex(sha1));
+                                 "see %s.paxheader", oid_to_hex(oid));

                        strbuf_append_ext_header(&ext_header, "linkpath",
                                                 buffer, size);
                } else
                        strbuf_append_ext_header(&ext_header, "linkpath",
                                                 buffer, size);
                } else


@@ -308,7 +308,7 @@ static int write_tar_entry(struct archiver_args *args,
        prepare_header(args, &header, mode, size_in_header);
 
        if (ext_header.len > 0) {
        prepare_header(args, &header, mode, size_in_header);
 
        if (ext_header.len > 0) {

-               write_extended_header(args, sha1, ext_header.buf,
+               write_extended_header(args, oid, ext_header.buf,

                                      ext_header.len);
        }
        strbuf_release(&ext_header);
                                      ext_header.len);
        }
        strbuf_release(&ext_header);


@@ -317,7 +317,7 @@ static int write_tar_entry(struct archiver_args *args,
                if (buffer)
                        write_blocked(buffer, size);
                else
                if (buffer)
                        write_blocked(buffer, size);
                else

-                       err = stream_blocked(sha1);
+                       err = stream_blocked(oid);

        }
        free(buffer);
        return err;
        }
        free(buffer);
        return err;

diff --git a/archive-zip.c b/archive-zip.c
index e8913e5a26c6e97216c4b79ad96b5e3ddf906c45..e2e5513c03ee9fe08593522b42431cb4ca482a8a 100644 (file)
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -276,7 +276,7 @@ static int entry_is_binary(const char *path, const void *buffer, size_t size)
 #define STREAM_BUFFER_SIZE (1024 * 16)
 
 static int write_zip_entry(struct archiver_args *args,
 #define STREAM_BUFFER_SIZE (1024 * 16)
 
 static int write_zip_entry(struct archiver_args *args,

-                          const unsigned char *sha1,
+                          const struct object_id *oid,

                           const char *path, size_t pathlen,
                           unsigned int mode)
 {
                           const char *path, size_t pathlen,
                           unsigned int mode)
 {


@@ -314,7 +314,7 @@ static int write_zip_entry(struct archiver_args *args,
 
        if (pathlen > 0xffff) {
                return error("path too long (%d chars, SHA1: %s): %s",
 
        if (pathlen > 0xffff) {
                return error("path too long (%d chars, SHA1: %s): %s",

-                               (int)pathlen, sha1_to_hex(sha1), path);
+                               (int)pathlen, oid_to_hex(oid), path);

        }
 
        if (S_ISDIR(mode) || S_ISGITLINK(mode)) {
        }
 
        if (S_ISDIR(mode) || S_ISGITLINK(mode)) {


@@ -325,7 +325,7 @@ static int write_zip_entry(struct archiver_args *args,
                compressed_size = 0;
                buffer = NULL;
        } else if (S_ISREG(mode) || S_ISLNK(mode)) {
                compressed_size = 0;
                buffer = NULL;
        } else if (S_ISREG(mode) || S_ISLNK(mode)) {

-               enum object_type type = sha1_object_info(sha1, &size);
+               enum object_type type = sha1_object_info(oid->hash, &size);

 
                method = 0;
                attr2 = S_ISLNK(mode) ? ((mode | 0777) << 16) :
 
                method = 0;
                attr2 = S_ISLNK(mode) ? ((mode | 0777) << 16) :


@@ -337,18 +337,18 @@ static int write_zip_entry(struct archiver_args *args,
 
                if (S_ISREG(mode) && type == OBJ_BLOB && !args->convert &&
                    size > big_file_threshold) {
 
                if (S_ISREG(mode) && type == OBJ_BLOB && !args->convert &&
                    size > big_file_threshold) {

-                       stream = open_istream(sha1, &type, &size, NULL);
+                       stream = open_istream(oid->hash, &type, &size, NULL);

                        if (!stream)
                                return error("cannot stream blob %s",
                        if (!stream)
                                return error("cannot stream blob %s",

-                                            sha1_to_hex(sha1));
+                                            oid_to_hex(oid));

                        flags |= ZIP_STREAM;
                        out = buffer = NULL;
                } else {
                        flags |= ZIP_STREAM;
                        out = buffer = NULL;
                } else {

-                       buffer = sha1_file_to_archive(args, path, sha1, mode,
+                       buffer = sha1_file_to_archive(args, path, oid->hash, mode,

                                                      &type, &size);
                        if (!buffer)
                                return error("cannot read %s",
                                                      &type, &size);
                        if (!buffer)
                                return error("cannot read %s",

-                                            sha1_to_hex(sha1));
+                                            oid_to_hex(oid));

                        crc = crc32(crc, buffer, size);
                        is_binary = entry_is_binary(path_without_prefix,
                                                    buffer, size);
                        crc = crc32(crc, buffer, size);
                        is_binary = entry_is_binary(path_without_prefix,
                                                    buffer, size);


@@ -357,7 +357,7 @@ static int write_zip_entry(struct archiver_args *args,
                compressed_size = (method == 0) ? size : 0;
        } else {
                return error("unsupported file mode: 0%o (SHA1: %s)", mode,
                compressed_size = (method == 0) ? size : 0;
        } else {
                return error("unsupported file mode: 0%o (SHA1: %s)", mode,

-                               sha1_to_hex(sha1));
+                               oid_to_hex(oid));

        }
 
        if (creator_version > max_creator_version)
        }
 
        if (creator_version > max_creator_version)

diff --git a/archive.c b/archive.c
index e664cdb624253491b8610685c4fca97d32b855fd..4942b5632bb2ec82a349b84cfc3e6d838f5bfaa7 100644 (file)
--- a/archive.c
+++ b/archive.c
@@ -121,7 +121,7 @@ static int check_attr_export_subst(const struct attr_check *check)
        return check && ATTR_TRUE(check->items[1].value);
 }
 
        return check && ATTR_TRUE(check->items[1].value);
 }
 

-static int write_archive_entry(const unsigned char *sha1, const char *base,
+static int write_archive_entry(const struct object_id *oid, const char *base,

                int baselen, const char *filename, unsigned mode, int stage,
                void *context)
 {
                int baselen, const char *filename, unsigned mode, int stage,
                void *context)
 {


@@ -153,7 +153,7 @@ static int write_archive_entry(const unsigned char *sha1, const char *base,
        if (S_ISDIR(mode) || S_ISGITLINK(mode)) {
                if (args->verbose)
                        fprintf(stderr, "%.*s\n", (int)path.len, path.buf);
        if (S_ISDIR(mode) || S_ISGITLINK(mode)) {
                if (args->verbose)
                        fprintf(stderr, "%.*s\n", (int)path.len, path.buf);

-               err = write_entry(args, sha1, path.buf, path.len, mode);
+               err = write_entry(args, oid, path.buf, path.len, mode);

                if (err)
                        return err;
                return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
                if (err)
                        return err;
                return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);


@@ -161,7 +161,7 @@ static int write_archive_entry(const unsigned char *sha1, const char *base,
 
        if (args->verbose)
                fprintf(stderr, "%.*s\n", (int)path.len, path.buf);
 
        if (args->verbose)
                fprintf(stderr, "%.*s\n", (int)path.len, path.buf);

-       return write_entry(args, sha1, path.buf, path.len, mode);
+       return write_entry(args, oid, path.buf, path.len, mode);

 }
 
 static void queue_directory(const unsigned char *sha1,
 }
 
 static void queue_directory(const unsigned char *sha1,


@@ -191,7 +191,7 @@ static int write_directory(struct archiver_context *c)
        d->path[d->len - 1] = '\0'; /* no trailing slash */
        ret =
                write_directory(c) ||
        d->path[d->len - 1] = '\0'; /* no trailing slash */
        ret =
                write_directory(c) ||

-               write_archive_entry(d->oid.hash, d->path, d->baselen,
+               write_archive_entry(&d->oid, d->path, d->baselen,

                                    d->path + d->baselen, d->mode,
                                    d->stage, c) != READ_TREE_RECURSIVE;
        free(d);
                                    d->path + d->baselen, d->mode,
                                    d->stage, c) != READ_TREE_RECURSIVE;
        free(d);


@@ -231,7 +231,7 @@ static int queue_or_write_archive_entry(const struct object_id *oid,
 
        if (write_directory(c))
                return -1;
 
        if (write_directory(c))
                return -1;

-       return write_archive_entry(oid->hash, base->buf, base->len, filename, mode,
+       return write_archive_entry(oid, base->buf, base->len, filename, mode,

                                   stage, context);
 }
 
                                   stage, context);
 }
 


@@ -250,7 +250,7 @@ int write_archive_entries(struct archiver_args *args,
                        len--;
                if (args->verbose)
                        fprintf(stderr, "%.*s\n", (int)len, args->base);
                        len--;
                if (args->verbose)
                        fprintf(stderr, "%.*s\n", (int)len, args->base);

-               err = write_entry(args, args->tree->object.oid.hash, args->base,
+               err = write_entry(args, &args->tree->object.oid, args->base,

                                  len, 040777);
                if (err)
                        return err;
                                  len, 040777);
                if (err)
                        return err;

diff --git a/archive.h b/archive.h
index 62d1d82c1af0fa3bf77b32d63e9b4866f3428898..741991bfb61b1ceb4f41db770c77a0a1369dbadd 100644 (file)
--- a/archive.h
+++ b/archive.h
@@ -31,7 +31,7 @@ extern void init_tar_archiver(void);
 extern void init_zip_archiver(void);
 
 typedef int (*write_archive_entry_fn_t)(struct archiver_args *args,
 extern void init_zip_archiver(void);
 
 typedef int (*write_archive_entry_fn_t)(struct archiver_args *args,

-                                       const unsigned char *sha1,
+                                       const struct object_id *oid,

                                        const char *path, size_t pathlen,
                                        unsigned int mode);
 
                                        const char *path, size_t pathlen,
                                        unsigned int mode);