git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 20/36] streaming: convert open_istream to use struct object_id

From
brian m. carlson <sandals@crustytoothpaste.net>
Date
Feb 19, 2018, 22:59 UTC
Message-ID
<20180219225927.386065-21-sandals@crustytoothpaste.net>
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);
Previous: brian m. carlsonNext: brian m. carlson
Message 9 of 39 in “object_id part 12”
  1. 00/36 object_id part 12brian m. carlson, Feb 19, 2018
  2. 01/36 bulk-checkin: convert index_bulk_checkin to struct object_idbrian m. carlson, Feb 19, 2018
  3. 02/36 builtin/write-tree: convert to struct object_idbrian m. carlson, Feb 19, 2018
  4. 03/36 cache-tree: convert write_*_as_tree to object_idbrian m. carlson, Feb 19, 2018
  5. 07/36 ref-filter: convert grab_objectname to struct object_idbrian m. carlson, Feb 19, 2018
  6. 13/36 replace_object: convert struct replace_object to object_idbrian m. carlson, Feb 19, 2018
  7. 14/36 builtin/mktag: convert to struct object_idbrian m. carlson, Feb 19, 2018
  8. 18/36 sha1_file: convert read_loose_object to use struct object_idbrian m. carlson, Feb 19, 2018
  9. 20/36 streaming: convert open_istream to use struct object_idbrian m. carlson, Feb 19, 2018
  10. 21/36 builtin/mktree: convert to struct object_idbrian m. carlson, Feb 19, 2018
  11. 24/36 packfile: convert unpack_entry to struct object_idbrian m. carlson, Feb 19, 2018
  12. 22/36 sha1_file: convert assert_sha1_type to object_idbrian m. carlson, Feb 19, 2018
  13. 29/36 tree-walk: convert get_tree_entry_follow_symlinks internals to object_idbrian m. carlson, Feb 19, 2018
  14. 31/36 tree-walk: convert tree entry functions to object_idbrian m. carlson, Feb 19, 2018
  15. 32/36 sha1_file: convert read_object_with_reference to object_idbrian m. carlson, Feb 19, 2018
  16. 35/36 sha1_file: introduce a constant for max header lengthbrian m. carlson, Feb 19, 2018
  17. 33/36 sha1_file: convert read_sha1_file to struct object_idbrian m. carlson, Feb 19, 2018
  18. 34/36 Convert lookup_replace_object to struct object_idbrian m. carlson, Feb 19, 2018
  19. 23/36 sha1_file: convert retry_bad_packed_offset to struct object_idbrian m. carlson, Feb 19, 2018
  20. 28/36 builtin/notes: convert static functions to object_idbrian m. carlson, Feb 19, 2018
  21. 30/36 streaming: convert istream internals to struct object_idbrian m. carlson, Feb 19, 2018
  22. 36/36 convert: convert to struct object_idbrian m. carlson, Feb 19, 2018
  23. 25/36 Convert remaining callers of sha1_object_info_extended to object_idbrian m. carlson, Feb 19, 2018
  24. 26/36 sha1_file: convert sha1_object_info* to object_idbrian m. carlson, Feb 19, 2018
  25. 27/36 builtin/fmt-merge-msg: convert remaining code to object_idbrian m. carlson, Feb 19, 2018
  26. 19/36 sha1_file: convert check_sha1_signature to struct object_idbrian m. carlson, Feb 19, 2018
  27. 17/36 builtin/index-pack: convert struct ref_delta_entry to object_idbrian m. carlson, Feb 19, 2018
  28. 06/36 tree: convert read_tree_recursive to struct object_idbrian m. carlson, Feb 19, 2018
  29. 15/36 archive: convert write_archive_entry_fn_t to object_idbrian m. carlson, Feb 19, 2018
  30. 16/36 archive: convert sha1_file_to_archive to struct object_idbrian m. carlson, Feb 19, 2018
  31. 09/36 wt-status: convert struct wt_status_state to object_idbrian m. carlson, Feb 19, 2018
  32. 12/36 send-pack: convert remaining functions to struct object_idbrian m. carlson, Feb 19, 2018
  33. 08/36 strbuf: convert strbuf_add_unique_abbrev to use struct object_idbrian m. carlson, Feb 19, 2018
  34. 05/36 resolve-undo: convert struct resolve_undo_info to object_idbrian m. carlson, Feb 19, 2018
  35. 04/36 cache-tree: convert remnants to struct object_idbrian m. carlson, Feb 19, 2018
  36. 10/36 Convert find_unique_abbrev* to struct object_idbrian m. carlson, Feb 19, 2018
  37. 11/36 http-walker: convert struct object_request to use struct object_idbrian m. carlson, Feb 19, 2018
  38. Junio C HamanoFeb 21, 2018
  39. brian m. carlsonFeb 22, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.