diff options
author | Brandon Williams <bmwill@google.com> | 2018-02-14 21:59:24 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-02-15 00:10:05 +0300 |
commit | debca9d2fe784193dc2d9f98b5edac605ddfefbb (patch) | |
tree | 080b732db21d1233d150c64311b9a013fb6aa200 /sha1_name.c | |
parent | 6ca32f47145370b6c0d956d1f8568d7e0595f195 (diff) |
object: rename function 'typename' to 'type_name'
Rename C++ keyword in order to bring the codebase closer to being able
to be compiled with a C++ compiler.
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_name.c')
-rw-r--r-- | sha1_name.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sha1_name.c b/sha1_name.c index 611c7d24dd..e7c18ffc26 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -381,7 +381,7 @@ static int show_ambiguous_object(const struct object_id *oid, void *data) advise(" %s %s%s", find_unique_abbrev(oid->hash, DEFAULT_ABBREV), - typename(type) ? typename(type) : "unknown type", + type_name(type) ? type_name(type) : "unknown type", desc.buf); strbuf_release(&desc); @@ -901,8 +901,8 @@ struct object *peel_to_type(const char *name, int namelen, if (name) error("%.*s: expected %s type, but the object " "dereferences to %s type", - namelen, name, typename(expected_type), - typename(o->type)); + namelen, name, type_name(expected_type), + type_name(o->type)); return NULL; } } |