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 /builtin/fsck.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 'builtin/fsck.c')
-rw-r--r-- | builtin/fsck.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/fsck.c b/builtin/fsck.c index 04846d4..246237e 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -70,7 +70,7 @@ static const char *printable_type(struct object *obj) object_as_type(obj, type, 0); } - ret = typename(obj->type); + ret = type_name(obj->type); if (!ret) ret = "unknown"; @@ -137,7 +137,7 @@ static int mark_object(struct object *obj, int type, void *data, struct fsck_opt printf("broken link from %7s %s\n", printable_type(parent), describe_object(parent)); printf("broken link from %7s %s\n", - (type == OBJ_ANY ? "unknown" : typename(type)), "unknown"); + (type == OBJ_ANY ? "unknown" : type_name(type)), "unknown"); errors_found |= ERROR_REACHABLE; return 1; } |