streaming: make stream_blob_to_fd take struct object_id
Since all of its callers have been updated, modify stream_blob_to_fd to take a struct object_id. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
Sep 5, 2016 at 20:07 UTC
7eda0e4fbbc243d4103cced29357bb08af36a139
6 files changed
+10
-10
builtin/cat-file.c
+3
-3
@@ -83,7 +83,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
83
}
84
85
if (type == OBJ_BLOB)
86
- return stream_blob_to_fd(1, oid.hash, NULL, 0);
86
+ return stream_blob_to_fd(1, &oid, NULL, 0);
87
buf = read_sha1_file(oid.hash, &type, &size);
88
if (!buf)
89
die("Cannot read object %s", obj_name);
@@ -105,7 +105,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
105
oidcpy(&blob_oid, &oid);
106
107
if (sha1_object_info(blob_oid.hash, NULL) == OBJ_BLOB)
108
- return stream_blob_to_fd(1, blob_oid.hash, NULL, 0);
108
+ return stream_blob_to_fd(1, &blob_oid, NULL, 0);
109
/*
110
* we attempted to dereference a tag to a blob
111
* and failed; there may be new dereference
@@ -240,7 +240,7 @@ static void print_object_or_die(struct batch_options *opt, struct expand_data *d
240
if (data->type == OBJ_BLOB) {
241
if (opt->buffer_output)
242
fflush(stdout);
243
- if (stream_blob_to_fd(1, oid->hash, NULL, 0) < 0)
243
+ if (stream_blob_to_fd(1, oid, NULL, 0) < 0)
244
die("unable to stream %s to stdout", oid_to_hex(oid));
245
}
246
else {
builtin/fsck.c
+1
-1
@@ -268,7 +268,7 @@ static void check_unreachable_object(struct object *obj)
268
if (!(f = fopen(filename, "w")))
269
die_errno("Could not open '%s'", filename);
270
if (obj->type == OBJ_BLOB) {
271
- if (stream_blob_to_fd(fileno(f), obj->oid.hash, NULL, 1))
271
+ if (stream_blob_to_fd(fileno(f), &obj->oid, NULL, 1))
272
die_errno("Could not write '%s'", filename);
273
} else
274
fprintf(f, "%s\n", describe_object(obj));
builtin/log.c
+2
-2
@@ -474,13 +474,13 @@ static int show_blob_object(const struct object_id *oid, struct rev_info *rev, c
474
fflush(rev->diffopt.file);
475
if (!DIFF_OPT_TOUCHED(&rev->diffopt, ALLOW_TEXTCONV) ||
476
!DIFF_OPT_TST(&rev->diffopt, ALLOW_TEXTCONV))
477
- return stream_blob_to_fd(1, oid->hash, NULL, 0);
477
+ return stream_blob_to_fd(1, oid, NULL, 0);
478
479
if (get_sha1_with_context(obj_name, 0, oidc.hash, &obj_context))
480
die(_("Not a valid object name %s"), obj_name);
481
if (!obj_context.path[0] ||
482
!textconv_object(obj_context.path, obj_context.mode, &oidc, 1, &buf, &size))
483
- return stream_blob_to_fd(1, oid->hash, NULL, 0);
483
+ return stream_blob_to_fd(1, oid, NULL, 0);
484
485
if (!buf)
486
die(_("git show %s: bad file"), obj_name);
entry.c
+1
-1
@@ -127,7 +127,7 @@ static int streaming_write_entry(const struct cache_entry *ce, char *path,
127
if (fd < 0)
128
return -1;
129
130
- result |= stream_blob_to_fd(fd, ce->oid.hash, filter, 1);
130
+ result |= stream_blob_to_fd(fd, &ce->oid, filter, 1);
131
*fstat_done = fstat_output(fd, state, statbuf);
132
result |= close(fd);
133
streaming.c
+2
-2
@@ -497,7 +497,7 @@ static open_method_decl(incore)
497
* Users of streaming interface
498
****************************************************************/
499
500
-int stream_blob_to_fd(int fd, unsigned const char *sha1, struct stream_filter *filter,
500
+int stream_blob_to_fd(int fd, const struct object_id *oid, struct stream_filter *filter,
501
int can_seek)
502
{
503
struct git_istream *st;
@@ -506,7 +506,7 @@ int stream_blob_to_fd(int fd, unsigned const char *sha1, struct stream_filter *f
506
ssize_t kept = 0;
507
int result = -1;
508
509
- st = open_istream(sha1, &type, &sz, filter);
509
+ st = open_istream(oid->hash, &type, &sz, filter);
510
if (!st) {
511
if (filter)
512
free_stream_filter(filter);
streaming.h
+1
-1
@@ -12,6 +12,6 @@ extern struct git_istream *open_istream(const unsigned char *, enum object_type
12
extern int close_istream(struct git_istream *);
13
extern ssize_t read_istream(struct git_istream *, void *, size_t);
14
15
-extern int stream_blob_to_fd(int fd, const unsigned char *, struct stream_filter *, int can_seek);
15
+extern int stream_blob_to_fd(int fd, const struct object_id *, struct stream_filter *, int can_seek);
16
17
#endif /* STREAMING_H */