summaryrefslogtreecommitdiff
path: root/packfile.c
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2018-02-14 18:59:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-14 21:10:05 (GMT)
commit6ca32f47145370b6c0d956d1f8568d7e0595f195 (patch)
tree6da62e2115f422c6df36b599aeb4607adb93616f /packfile.c
parent5be1f00a9a701532232f57958efab4be8c959a29 (diff)
downloadgit-6ca32f47145370b6c0d956d1f8568d7e0595f195.zip
git-6ca32f47145370b6c0d956d1f8568d7e0595f195.tar.gz
git-6ca32f47145370b6c0d956d1f8568d7e0595f195.tar.bz2
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 <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'packfile.c')
-rw-r--r--packfile.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/packfile.c b/packfile.c
index 4a5fe7a..6657a0a 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;