From 6ca32f47145370b6c0d956d1f8568d7e0595f195 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Wed, 14 Feb 2018 10:59:23 -0800 Subject: object_info: change member name from '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 Signed-off-by: Junio C Hamano --- packfile.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packfile.c') diff --git a/packfile.c b/packfile.c index 4a5fe7ab18..6657a0a499 100644 --- a/packfile.c +++ b/packfile.c @@ -1350,16 +1350,16 @@ int packed_object_info(struct packed_git *p, off_t obj_offset, *oi->disk_sizep = revidx[1].offset - obj_offset; } - if (oi->typep || oi->typename) { + if (oi->typep || oi->type_name) { enum object_type ptot; ptot = packed_to_object_type(p, obj_offset, type, &w_curs, curpos); if (oi->typep) *oi->typep = ptot; - if (oi->typename) { + if (oi->type_name) { const char *tn = typename(ptot); if (tn) - strbuf_addstr(oi->typename, tn); + strbuf_addstr(oi->type_name, tn); } if (ptot < 0) { type = OBJ_BAD; -- cgit v1.2.1 From debca9d2fe784193dc2d9f98b5edac605ddfefbb Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Wed, 14 Feb 2018 10:59:24 -0800 Subject: 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 Signed-off-by: Junio C Hamano --- packfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packfile.c') diff --git a/packfile.c b/packfile.c index 6657a0a499..0532a371b2 100644 --- a/packfile.c +++ b/packfile.c @@ -1357,7 +1357,7 @@ int packed_object_info(struct packed_git *p, off_t obj_offset, if (oi->typep) *oi->typep = ptot; if (oi->type_name) { - const char *tn = typename(ptot); + const char *tn = type_name(ptot); if (tn) strbuf_addstr(oi->type_name, tn); } -- cgit v1.2.1