зеркало из https://github.com/microsoft/git.git
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 <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
2608c24940
Коммит
2e3dfb2169
2
commit.h
2
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 {
|
||||
|
|
|
@ -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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче