diff options
| author | Brandon Williams <bmwill@google.com> | 2018-02-14 19:59:24 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-14 22:10:05 +0100 |
| commit | debca9d2fe784193dc2d9f98b5edac605ddfefbb (patch) | |
| tree | 080b732db21d1233d150c64311b9a013fb6aa200 /bulk-checkin.c | |
| parent | object_info: change member name from 'typename' to 'type_name' (diff) | |
| download | git-debca9d2fe784193dc2d9f98b5edac605ddfefbb.tar.xz git-debca9d2fe784193dc2d9f98b5edac605ddfefbb.zip | |
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 'bulk-checkin.c')
| -rw-r--r-- | bulk-checkin.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bulk-checkin.c b/bulk-checkin.c index 3310fd210a..bb788494fd 100644 --- a/bulk-checkin.c +++ b/bulk-checkin.c @@ -203,7 +203,7 @@ static int deflate_to_pack(struct bulk_checkin_state *state, return error("cannot find the current offset"); header_len = xsnprintf((char *)obuf, sizeof(obuf), "%s %" PRIuMAX, - typename(type), (uintmax_t)size) + 1; + type_name(type), (uintmax_t)size) + 1; git_SHA1_Init(&ctx); git_SHA1_Update(&ctx, obuf, header_len); |