diff options
author | Brandon Williams <bmwill@google.com> | 2018-02-14 18:59:24 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-02-14 21:10:05 (GMT) |
commit | debca9d2fe784193dc2d9f98b5edac605ddfefbb (patch) | |
tree | 080b732db21d1233d150c64311b9a013fb6aa200 /object.c | |
parent | 6ca32f47145370b6c0d956d1f8568d7e0595f195 (diff) | |
download | git-debca9d2fe784193dc2d9f98b5edac605ddfefbb.zip git-debca9d2fe784193dc2d9f98b5edac605ddfefbb.tar.gz git-debca9d2fe784193dc2d9f98b5edac605ddfefbb.tar.bz2 |
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 'object.c')
-rw-r--r-- | object.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -26,7 +26,7 @@ static const char *object_type_strings[] = { "tag", /* OBJ_TAG = 4 */ }; -const char *typename(unsigned int type) +const char *type_name(unsigned int type) { if (type >= ARRAY_SIZE(object_type_strings)) return NULL; @@ -166,7 +166,7 @@ void *object_as_type(struct object *obj, enum object_type type, int quiet) if (!quiet) error("object %s is a %s, not a %s", oid_to_hex(&obj->oid), - typename(obj->type), typename(type)); + type_name(obj->type), type_name(type)); return NULL; } } @@ -265,7 +265,7 @@ struct object *parse_object(const struct object_id *oid) buffer = read_sha1_file(oid->hash, &type, &size); if (buffer) { - if (check_sha1_signature(repl, buffer, size, typename(type)) < 0) { + if (check_sha1_signature(repl, buffer, size, type_name(type)) < 0) { free(buffer); error("sha1 mismatch %s", sha1_to_hex(repl)); return NULL; |