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 v3 22/36] sha1_file: convert assert_sha1_type to object_id Date: Mon, 12 Mar 2018 02:27:42 +0000 Message-ID: <20180312022756.483934-23-sandals@crustytoothpaste.net> (raw) In-Reply-To: <20180312022756.483934-1-sandals@crustytoothpaste.net> Convert this function to take a pointer to struct object_id and rename it to assert_oid_type. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> --- builtin/commit-tree.c | 2 +- cache.h | 2 +- commit.c | 2 +- sha1_file.c | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c index e5bdf57b1e..ecf42191da 100644 --- a/builtin/commit-tree.c +++ b/builtin/commit-tree.c @@ -58,7 +58,7 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix) usage(commit_tree_usage); if (get_oid_commit(argv[i], &oid)) die("Not a valid object name %s", argv[i]); - assert_sha1_type(oid.hash, OBJ_COMMIT); + assert_oid_type(&oid, OBJ_COMMIT); new_parent(lookup_commit(&oid), &parents); continue; } diff --git a/cache.h b/cache.h index 27b5fd8a39..67a04fcd12 100644 --- a/cache.h +++ b/cache.h @@ -1275,7 +1275,7 @@ extern int has_object_file_with_flags(const struct object_id *oid, int flags); */ extern int has_loose_object_nonlocal(const unsigned char *sha1); -extern void assert_sha1_type(const unsigned char *sha1, enum object_type expect); +extern void assert_oid_type(const struct object_id *oid, enum object_type expect); /* Helper to check and "touch" a file */ extern int check_and_freshen_file(const char *fn, int freshen); diff --git a/commit.c b/commit.c index 00c99c7272..6d77787af9 100644 --- a/commit.c +++ b/commit.c @@ -1517,7 +1517,7 @@ int commit_tree_extended(const char *msg, size_t msg_len, int encoding_is_utf8; struct strbuf buffer; - assert_sha1_type(tree->hash, OBJ_TREE); + assert_oid_type(tree, OBJ_TREE); if (memchr(msg, '\0', msg_len)) return error("a NUL byte in commit log message not allowed."); diff --git a/sha1_file.c b/sha1_file.c index cdcba4483b..a307037e88 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1966,13 +1966,13 @@ int read_pack_header(int fd, struct pack_header *header) return 0; } -void assert_sha1_type(const unsigned char *sha1, enum object_type expect) +void assert_oid_type(const struct object_id *oid, enum object_type expect) { - enum object_type type = sha1_object_info(sha1, NULL); + enum object_type type = sha1_object_info(oid->hash, NULL); if (type < 0) - die("%s is not a valid object", sha1_to_hex(sha1)); + die("%s is not a valid object", oid_to_hex(oid)); if (type != expect) - die("%s is not a valid '%s' object", sha1_to_hex(sha1), + die("%s is not a valid '%s' object", oid_to_hex(oid), type_name(expect)); }
next prev parent reply index Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-03-12 2:27 [PATCH v3 00/36] object_id part 12 brian m. carlson 2018-03-12 2:27 ` [PATCH v3 01/36] bulk-checkin: convert index_bulk_checkin to struct object_id brian m. carlson 2018-03-12 2:27 ` [PATCH v3 02/36] builtin/write-tree: convert " brian m. carlson 2018-03-12 2:27 ` [PATCH v3 03/36] cache-tree: convert write_*_as_tree to object_id brian m. carlson 2018-03-12 2:27 ` [PATCH v3 04/36] cache-tree: convert remnants to struct object_id brian m. carlson 2018-03-12 2:27 ` [PATCH v3 05/36] resolve-undo: convert struct resolve_undo_info to object_id brian m. carlson 2018-03-12 2:27 ` [PATCH v3 06/36] tree: convert read_tree_recursive to struct object_id brian m. carlson 2018-03-12 2:27 ` [PATCH v3 07/36] ref-filter: convert grab_objectname " brian m. carlson 2018-03-12 2:27 ` [PATCH v3 08/36] strbuf: convert strbuf_add_unique_abbrev to use " brian m. carlson 2018-03-12 2:27 ` [PATCH v3 09/36] wt-status: convert struct wt_status_state to object_id brian m. carlson 2018-03-12 2:27 ` [PATCH v3 10/36] Convert find_unique_abbrev* to struct object_id brian m. carlson 2018-03-12 2:27 ` [PATCH v3 11/36] http-walker: convert struct object_request to use " brian m. carlson 2018-03-12 2:27 ` [PATCH v3 12/36] send-pack: convert remaining functions to " brian m. carlson 2018-03-12 2:27 ` [PATCH v3 13/36] replace_object: convert struct replace_object to object_id brian m. carlson 2018-03-12 2:27 ` [PATCH v3 14/36] builtin/mktag: convert to struct object_id brian m. carlson 2018-03-12 2:27 ` [PATCH v3 15/36] archive: convert write_archive_entry_fn_t to object_id brian m. carlson 2018-03-12 2:27 ` [PATCH v3 16/36] archive: convert sha1_file_to_archive to struct object_id brian m. carlson 2018-03-12 2:27 ` [PATCH v3 17/36] builtin/index-pack: convert struct ref_delta_entry to object_id brian m. carlson 2018-03-12 2:27 ` [PATCH v3 18/36] sha1_file: convert read_loose_object to use struct object_id brian m. carlson 2018-03-12 2:27 ` [PATCH v3 19/36] sha1_file: convert check_sha1_signature to " brian m. carlson 2018-03-12 2:27 ` [PATCH v3 20/36] streaming: convert open_istream to use " brian m. carlson 2018-03-12 2:27 ` [PATCH v3 21/36] builtin/mktree: convert to " brian m. carlson 2018-03-12 2:27 ` brian m. carlson [this message] 2018-03-12 2:27 ` [PATCH v3 23/36] sha1_file: convert retry_bad_packed_offset " brian m. carlson 2018-03-12 2:27 ` [PATCH v3 24/36] packfile: convert unpack_entry " brian m. carlson 2018-03-12 2:27 ` [PATCH v3 25/36] Convert remaining callers of sha1_object_info_extended to object_id brian m. carlson 2018-03-12 2:27 ` [PATCH v3 26/36] sha1_file: convert sha1_object_info* " brian m. carlson 2018-03-12 2:27 ` [PATCH v3 27/36] builtin/fmt-merge-msg: convert remaining code " brian m. carlson 2018-03-12 2:27 ` [PATCH v3 28/36] builtin/notes: convert static functions " brian m. carlson 2018-03-12 2:27 ` [PATCH v3 29/36] tree-walk: convert get_tree_entry_follow_symlinks internals " brian m. carlson 2018-03-12 2:27 ` [PATCH v3 30/36] streaming: convert istream internals to struct object_id brian m. carlson 2018-03-12 2:27 ` [PATCH v3 31/36] tree-walk: convert tree entry functions to object_id brian m. carlson 2018-03-12 2:27 ` [PATCH v3 32/36] sha1_file: convert read_object_with_reference " brian m. carlson 2018-03-12 2:27 ` [PATCH v3 33/36] sha1_file: convert read_sha1_file to struct object_id brian m. carlson 2018-03-12 2:27 ` [PATCH v3 34/36] Convert lookup_replace_object " brian m. carlson 2018-03-12 2:27 ` [PATCH v3 35/36] sha1_file: introduce a constant for max header length brian m. carlson 2018-03-12 2:27 ` [PATCH v3 36/36] convert: convert to struct object_id brian m. carlson 2018-03-14 16:48 ` [PATCH v3 00/36] object_id part 12 Junio C Hamano 2018-03-14 19:46 ` Junio C Hamano 2018-03-15 1:05 ` brian m. carlson 2018-03-14 17:31 ` Junio C Hamano 2018-03-15 0:53 ` brian m. carlson
Reply instructions: You may reply publically 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 List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180312022756.483934-23-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
git@vger.kernel.org list mirror (unofficial, one of many) Archives are clonable: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git Example config snippet for mirrors Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.org/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ AGPL code for this site: git clone https://public-inbox.org/public-inbox.git