upload-pack: move shallow_nr to upload_pack_data

[thirdparty/git.git] / archive-tar.c

diff --git a/archive-tar.c b/archive-tar.c
index e16d3f756ddd61d38477e73b71aa01e912ba2b13..5ceec3684be910c44216d38e11f240fa4cc22ed3 100644 (file)
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -112,7 +112,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
  */
-static int stream_blocked(const struct object_id *oid)
+static int stream_blocked(struct repository *r, const struct object_id *oid)
 {
        struct git_istream *st;
        enum object_type type;
@@ -120,7 +120,7 @@ static int stream_blocked(const struct object_id *oid)
        char buf[BLOCKSIZE];
        ssize_t readlen;
 
-       st = open_istream(oid, &type, &sz, NULL);
+       st = open_istream(r, oid, &type, &sz, NULL);
        if (!st)
                return error(_("cannot stream blob %s"), oid_to_hex(oid));
        for (;;) {
@@ -324,7 +324,7 @@ static int write_tar_entry(struct archiver_args *args,
                if (buffer)
                        write_blocked(buffer, size);
                else
-                       err = stream_blocked(oid);
+                       err = stream_blocked(args->repo, oid);
        }
        free(buffer);
        return err;
@@ -364,7 +364,7 @@ static struct archiver **tar_filters;
 static int nr_tar_filters;
 static int alloc_tar_filters;
 
-static struct archiver *find_tar_filter(const char *name, int len)
+static struct archiver *find_tar_filter(const char *name, size_t len)
 {
        int i;
        for (i = 0; i < nr_tar_filters; i++) {
@@ -380,7 +380,7 @@ static int tar_filter_config(const char *var, const char *value, void *data)
        struct archiver *ar;
        const char *name;
        const char *type;
-       int namelen;
+       size_t namelen;
 
        if (parse_config_key(var, "tar", &name, &namelen, &type) < 0 || !name)
                return 0;