All of lore.kernel.org
 help / color / mirror / Atom feed
From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
	"Patryk Obara" <patryk.obara@gmail.com>,
	"Jeff King" <peff@peff.net>,
	"Eric Sunshine" <sunshine@sunshineco.com>
Subject: [PATCH 20/36] streaming: convert open_istream to use struct object_id
Date: Mon, 19 Feb 2018 22:59:11 +0000	[thread overview]
Message-ID: <20180219225927.386065-21-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <20180219225927.386065-1-sandals@crustytoothpaste.net>

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
 archive-tar.c          | 2 +-
 archive-zip.c          | 2 +-
 builtin/index-pack.c   | 2 +-
 builtin/pack-objects.c | 2 +-
 sha1_file.c            | 2 +-
 streaming.c            | 6 +++---
 streaming.h            | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/archive-tar.c b/archive-tar.c
index fd622eacc0..7a0d31d847 100644
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -119,7 +119,7 @@ static int stream_blocked(const struct object_id *oid)
 	char buf[BLOCKSIZE];
 	ssize_t readlen;
 
-	st = open_istream(oid->hash, &type, &sz, NULL);
+	st = open_istream(oid, &type, &sz, NULL);
 	if (!st)
 		return error("cannot stream blob %s", oid_to_hex(oid));
 	for (;;) {
diff --git a/archive-zip.c b/archive-zip.c
index 5841a6ceb6..18b951b732 100644
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -337,7 +337,7 @@ static int write_zip_entry(struct archiver_args *args,
 
 		if (S_ISREG(mode) && type == OBJ_BLOB && !args->convert &&
 		    size > big_file_threshold) {
-			stream = open_istream(oid->hash, &type, &size, NULL);
+			stream = open_istream(oid, &type, &size, NULL);
 			if (!stream)
 				return error("cannot stream blob %s",
 					     oid_to_hex(oid));
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index e0a776f1ac..a0ca525e99 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -771,7 +771,7 @@ static int check_collison(struct object_entry *entry)
 
 	memset(&data, 0, sizeof(data));
 	data.entry = entry;
-	data.st = open_istream(entry->idx.oid.hash, &type, &size, NULL);
+	data.st = open_istream(&entry->idx.oid, &type, &size, NULL);
 	if (!data.st)
 		return -1;
 	if (size != entry->size || type != entry->type)
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 5c674b2843..ef63aa5878 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -267,7 +267,7 @@ static unsigned long write_no_reuse_object(struct hashfile *f, struct object_ent
 	if (!usable_delta) {
 		if (entry->type == OBJ_BLOB &&
 		    entry->size > big_file_threshold &&
-		    (st = open_istream(entry->idx.oid.hash, &type, &size, NULL)) != NULL)
+		    (st = open_istream(&entry->idx.oid, &type, &size, NULL)) != NULL)
 			buf = NULL;
 		else {
 			buf = read_sha1_file(entry->idx.oid.hash, &type,
diff --git a/sha1_file.c b/sha1_file.c
index 64f0905799..5dc85122c3 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -799,7 +799,7 @@ int check_object_signature(const struct object_id *oid, void *map,
 		return oidcmp(oid, &real_oid) ? -1 : 0;
 	}
 
-	st = open_istream(oid->hash, &obj_type, &size, NULL);
+	st = open_istream(oid, &obj_type, &size, NULL);
 	if (!st)
 		return -1;
 
diff --git a/streaming.c b/streaming.c
index 5892b50bd8..be85507922 100644
--- a/streaming.c
+++ b/streaming.c
@@ -130,14 +130,14 @@ static enum input_source istream_source(const unsigned char *sha1,
 	}
 }
 
-struct git_istream *open_istream(const unsigned char *sha1,
+struct git_istream *open_istream(const struct object_id *oid,
 				 enum object_type *type,
 				 unsigned long *size,
 				 struct stream_filter *filter)
 {
 	struct git_istream *st;
 	struct object_info oi = OBJECT_INFO_INIT;
-	const unsigned char *real = lookup_replace_object(sha1);
+	const unsigned char *real = lookup_replace_object(oid->hash);
 	enum input_source src = istream_source(real, type, &oi);
 
 	if (src < 0)
@@ -507,7 +507,7 @@ int stream_blob_to_fd(int fd, const struct object_id *oid, struct stream_filter
 	ssize_t kept = 0;
 	int result = -1;
 
-	st = open_istream(oid->hash, &type, &sz, filter);
+	st = open_istream(oid, &type, &sz, filter);
 	if (!st) {
 		if (filter)
 			free_stream_filter(filter);
diff --git a/streaming.h b/streaming.h
index 73c1d156b3..32f4626771 100644
--- a/streaming.h
+++ b/streaming.h
@@ -8,7 +8,7 @@
 /* opaque */
 struct git_istream;
 
-extern struct git_istream *open_istream(const unsigned char *, enum object_type *, unsigned long *, struct stream_filter *);
+extern struct git_istream *open_istream(const struct object_id *, enum object_type *, unsigned long *, struct stream_filter *);
 extern int close_istream(struct git_istream *);
 extern ssize_t read_istream(struct git_istream *, void *, size_t);
 

  parent reply	other threads:[~2018-02-19 22:59 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-19 22:58 [PATCH 00/36] object_id part 12 brian m. carlson
2018-02-19 22:58 ` [PATCH 01/36] bulk-checkin: convert index_bulk_checkin to struct object_id brian m. carlson
2018-02-19 22:58 ` [PATCH 02/36] builtin/write-tree: convert " brian m. carlson
2018-02-19 22:58 ` [PATCH 03/36] cache-tree: convert write_*_as_tree to object_id brian m. carlson
2018-02-19 22:58 ` [PATCH 04/36] cache-tree: convert remnants to struct object_id brian m. carlson
2018-02-19 22:58 ` [PATCH 05/36] resolve-undo: convert struct resolve_undo_info to object_id brian m. carlson
2018-02-19 22:58 ` [PATCH 06/36] tree: convert read_tree_recursive to struct object_id brian m. carlson
2018-02-19 22:58 ` [PATCH 07/36] ref-filter: convert grab_objectname " brian m. carlson
2018-02-19 22:58 ` [PATCH 08/36] strbuf: convert strbuf_add_unique_abbrev to use " brian m. carlson
2018-02-19 22:59 ` [PATCH 09/36] wt-status: convert struct wt_status_state to object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 10/36] Convert find_unique_abbrev* to struct object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 11/36] http-walker: convert struct object_request to use " brian m. carlson
2018-02-19 22:59 ` [PATCH 12/36] send-pack: convert remaining functions to " brian m. carlson
2018-02-19 22:59 ` [PATCH 13/36] replace_object: convert struct replace_object to object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 14/36] builtin/mktag: convert to struct object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 15/36] archive: convert write_archive_entry_fn_t to object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 16/36] archive: convert sha1_file_to_archive to struct object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 17/36] builtin/index-pack: convert struct ref_delta_entry to object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 18/36] sha1_file: convert read_loose_object to use struct object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 19/36] sha1_file: convert check_sha1_signature to " brian m. carlson
2018-02-19 22:59 ` brian m. carlson [this message]
2018-02-19 22:59 ` [PATCH 21/36] builtin/mktree: convert " brian m. carlson
2018-02-19 22:59 ` [PATCH 22/36] sha1_file: convert assert_sha1_type to object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 23/36] sha1_file: convert retry_bad_packed_offset to struct object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 24/36] packfile: convert unpack_entry " brian m. carlson
2018-02-19 22:59 ` [PATCH 25/36] Convert remaining callers of sha1_object_info_extended to object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 26/36] sha1_file: convert sha1_object_info* " brian m. carlson
2018-02-19 22:59 ` [PATCH 27/36] builtin/fmt-merge-msg: convert remaining code " brian m. carlson
2018-02-19 22:59 ` [PATCH 28/36] builtin/notes: convert static functions " brian m. carlson
2018-02-19 22:59 ` [PATCH 29/36] tree-walk: convert get_tree_entry_follow_symlinks internals " brian m. carlson
2018-02-19 22:59 ` [PATCH 30/36] streaming: convert istream internals to struct object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 31/36] tree-walk: convert tree entry functions to object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 32/36] sha1_file: convert read_object_with_reference " brian m. carlson
2018-02-19 22:59 ` [PATCH 33/36] sha1_file: convert read_sha1_file to struct object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 34/36] Convert lookup_replace_object " brian m. carlson
2018-02-19 22:59 ` [PATCH 35/36] sha1_file: introduce a constant for max header length brian m. carlson
2018-02-19 22:59 ` [PATCH 36/36] convert: convert to struct object_id brian m. carlson
2018-02-21 18:47 ` [PATCH 00/36] object_id part 12 Junio C Hamano
2018-02-22  0:24   ` brian m. carlson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180219225927.386065-21-sandals@crustytoothpaste.net \
    --to=sandals@crustytoothpaste.net \
    --cc=git@vger.kernel.org \
    --cc=patryk.obara@gmail.com \
    --cc=pclouds@gmail.com \
    --cc=peff@peff.net \
    --cc=sunshine@sunshineco.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.