diff options
author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-03-12 02:27:53 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-03-14 09:23:50 -0700 |
commit | b4f5aca40e6f77cbabcbf4ff003c3cf30a1830c8 (patch) | |
tree | 110f0f2b8efdd4751787144948cb5ba028a850cd /builtin/mktag.c | |
parent | sha1_file: convert read_object_with_reference to object_id (diff) | |
download | tgif-b4f5aca40e6f77cbabcbf4ff003c3cf30a1830c8.tar.xz |
sha1_file: convert read_sha1_file to struct object_id
Convert read_sha1_file to take a pointer to struct object_id and rename
it read_object_file. Do the same for read_sha1_file_extended.
Convert one use in grep.c to use the new function without any other code
change, since the pointer being passed is a void pointer that is already
initialized with a pointer to struct object_id. Update the declaration
and definitions of the modified functions, and apply the following
semantic patch to convert the remaining callers:
@@
expression E1, E2, E3;
@@
- read_sha1_file(E1.hash, E2, E3)
+ read_object_file(&E1, E2, E3)
@@
expression E1, E2, E3;
@@
- read_sha1_file(E1->hash, E2, E3)
+ read_object_file(E1, E2, E3)
@@
expression E1, E2, E3, E4;
@@
- read_sha1_file_extended(E1.hash, E2, E3, E4)
+ read_object_file_extended(&E1, E2, E3, E4)
@@
expression E1, E2, E3, E4;
@@
- read_sha1_file_extended(E1->hash, E2, E3, E4)
+ read_object_file_extended(E1, E2, E3, E4)
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/mktag.c')
-rw-r--r-- | builtin/mktag.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/mktag.c b/builtin/mktag.c index 810b24bef3..cfb777b3c8 100644 --- a/builtin/mktag.c +++ b/builtin/mktag.c @@ -23,7 +23,7 @@ static int verify_object(const struct object_id *oid, const char *expected_type) int ret = -1; enum object_type type; unsigned long size; - void *buffer = read_sha1_file(oid->hash, &type, &size); + void *buffer = read_object_file(oid, &type, &size); const unsigned char *repl = lookup_replace_object(oid->hash); if (buffer) { |