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>

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index f5fa4fd75af26a66cd1b2c0d493116704bc16dd5..d06c66c77ebda439e3143e3054a744d0b1462486 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -76,7 +76,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
        buf = NULL;
        switch (opt) {
        case 't':
        buf = NULL;
        switch (opt) {
        case 't':

-               oi.typename = &sb;
+               oi.type_name = &sb;

                if (sha1_object_info_extended(oid.hash, &oi, flags) < 0)
                        die("git cat-file: could not get object info");
                if (sb.len) {
                if (sha1_object_info_extended(oid.hash, &oi, flags) < 0)
                        die("git cat-file: could not get object info");
                if (sb.len) {

diff --git a/cache.h b/cache.h
index d8b975a5715e8a5ec7c32e176958725cba61d67a..69b5a3bf81e3bf83453e10b7ae2cba7cc7ef5bc1 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1744,7 +1744,7 @@ struct object_info {
        unsigned long *sizep;
        off_t *disk_sizep;
        unsigned char *delta_base_sha1;
        unsigned long *sizep;
        off_t *disk_sizep;
        unsigned char *delta_base_sha1;

-       struct strbuf *typename;
+       struct strbuf *type_name;

        void **contentp;
 
        /* Response */
        void **contentp;
 
        /* Response */

diff --git a/packfile.c b/packfile.c
index 4a5fe7ab1883843a389ce74bf1c7bd89890d8e51..6657a0a499f543b39dfd96f89c4e00eca2f93d9b 100644 (file)
--- 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;
        }
 
                *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;
                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)
                        const char *tn = typename(ptot);
                        if (tn)

-                               strbuf_addstr(oi->typename, tn);
+                               strbuf_addstr(oi->type_name, tn);

                }
                if (ptot < 0) {
                        type = OBJ_BAD;
                }
                if (ptot < 0) {
                        type = OBJ_BAD;

diff --git a/sha1_file.c b/sha1_file.c
index 3da70ac650a8cdeca6ef8a6a424a7740d38267d5..2c03458eaf31197ce21d9f30764912e4782aaa93 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1087,8 +1087,8 @@ static int parse_sha1_header_extended(const char *hdr, struct object_info *oi,
        }
 
        type = type_from_string_gently(type_buf, type_len, 1);
        }
 
        type = type_from_string_gently(type_buf, type_len, 1);

-       if (oi->typename)
-               strbuf_add(oi->typename, type_buf, type_len);
+       if (oi->type_name)
+               strbuf_add(oi->type_name, type_buf, type_len);

        /*
         * Set type to 0 if its an unknown object and
         * we're obtaining the type using '--allow-unknown-type'
        /*
         * Set type to 0 if its an unknown object and
         * we're obtaining the type using '--allow-unknown-type'


@@ -1158,7 +1158,7 @@ static int sha1_loose_object_info(const unsigned char *sha1,
         * return value implicitly indicates whether the
         * object even exists.
         */
         * return value implicitly indicates whether the
         * object even exists.
         */

-       if (!oi->typep && !oi->typename && !oi->sizep && !oi->contentp) {
+       if (!oi->typep && !oi->type_name && !oi->sizep && !oi->contentp) {

                const char *path;
                struct stat st;
                if (stat_sha1_file(sha1, &st, &path) < 0)
                const char *path;
                struct stat st;
                if (stat_sha1_file(sha1, &st, &path) < 0)


@@ -1239,8 +1239,8 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi,
                                *(oi->disk_sizep) = 0;
                        if (oi->delta_base_sha1)
                                hashclr(oi->delta_base_sha1);
                                *(oi->disk_sizep) = 0;
                        if (oi->delta_base_sha1)
                                hashclr(oi->delta_base_sha1);

-                       if (oi->typename)
-                               strbuf_addstr(oi->typename, typename(co->type));
+                       if (oi->type_name)
+                               strbuf_addstr(oi->type_name, typename(co->type));

                        if (oi->contentp)
                                *oi->contentp = xmemdupz(co->buf, co->size);
                        oi->whence = OI_CACHED;
                        if (oi->contentp)
                                *oi->contentp = xmemdupz(co->buf, co->size);
                        oi->whence = OI_CACHED;