From 2e3dfb216991974b60fdb1933eb3331e03383e61 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Tue, 26 Aug 2014 06:24:20 -0400 Subject: [PATCH] log-tree: use FLEX_ARRAY in name_decoration We are already using the flex-array technique; let's annotate it with our usual FLEX_ARRAY macro. Besides being more readable, this is slightly more efficient on compilers that understand flex-arrays. Note that we need to bump the allocation in add_name_decoration, which did not explicitly add one byte for the NUL terminator of the string we are putting into the flex-array (it did not need to before, because the struct itself was over-allocated by one byte). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- commit.h | 2 +- log-tree.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/commit.h b/commit.h index f3d2f57a89..99b9e78209 100644 --- a/commit.h +++ b/commit.h @@ -30,7 +30,7 @@ extern const char *commit_type; struct name_decoration { struct name_decoration *next; int type; - char name[1]; + char name[FLEX_ARRAY]; }; enum decoration_type { diff --git a/log-tree.c b/log-tree.c index 2adf82ba02..de760db1a6 100644 --- a/log-tree.c +++ b/log-tree.c @@ -77,7 +77,7 @@ int parse_decorate_color_config(const char *var, const int ofs, const char *valu void add_name_decoration(enum decoration_type type, const char *name, struct object *obj) { int nlen = strlen(name); - struct name_decoration *res = xmalloc(sizeof(struct name_decoration) + nlen); + struct name_decoration *res = xmalloc(sizeof(*res) + nlen + 1); memcpy(res->name, name, nlen + 1); res->type = type; res->next = add_decoration(&name_decoration, obj, res);