From c089320cf616d7817a0662d3963ae8ea0c4bc62d Mon Sep 17 00:00:00 2001 From: René Scharfe Date: Sat, 13 Aug 2016 14:09:49 +0200 Subject: commit: use xstrdup() in get_merge_parent() Handle allocation errors for the name member just like we already do for the struct merge_remote_desc itself. Signed-off-by: Rene Scharfe Reviewed-by: Jeff King Signed-off-by: Junio C Hamano --- commit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'commit.c') diff --git a/commit.c b/commit.c index 2a90e37519..dd955e3e29 100644 --- a/commit.c +++ b/commit.c @@ -1589,7 +1589,7 @@ struct commit *get_merge_parent(const char *name) struct merge_remote_desc *desc; desc = xmalloc(sizeof(*desc)); desc->obj = obj; - desc->name = strdup(name); + desc->name = xstrdup(name); commit->util = desc; } return commit; -- cgit v1.2.3 From beb518c9850f459a71a2cb9e1d36e677528a55c0 Mon Sep 17 00:00:00 2001 From: René Scharfe Date: Sat, 13 Aug 2016 14:11:27 +0200 Subject: commit: factor out set_merge_remote_desc() Export a helper function for allocating, populating and attaching a merge_remote_desc to a commit. Signed-off-by: Rene Scharfe Reviewed-by: Jeff King Signed-off-by: Junio C Hamano --- commit.c | 19 ++++++++++++------- commit.h | 2 ++ 2 files changed, 14 insertions(+), 7 deletions(-) (limited to 'commit.c') diff --git a/commit.c b/commit.c index dd955e3e29..fc3d6fb2c3 100644 --- a/commit.c +++ b/commit.c @@ -1576,6 +1576,16 @@ int commit_tree_extended(const char *msg, size_t msg_len, return result; } +void set_merge_remote_desc(struct commit *commit, + const char *name, struct object *obj) +{ + struct merge_remote_desc *desc; + desc = xmalloc(sizeof(*desc)); + desc->obj = obj; + desc->name = xstrdup(name); + commit->util = desc; +} + struct commit *get_merge_parent(const char *name) { struct object *obj; @@ -1585,13 +1595,8 @@ struct commit *get_merge_parent(const char *name) return NULL; obj = parse_object(oid.hash); commit = (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT); - if (commit && !commit->util) { - struct merge_remote_desc *desc; - desc = xmalloc(sizeof(*desc)); - desc->obj = obj; - desc->name = xstrdup(name); - commit->util = desc; - } + if (commit && !commit->util) + set_merge_remote_desc(commit, name, obj); return commit; } diff --git a/commit.h b/commit.h index adf57d6c94..ed2a1f0265 100644 --- a/commit.h +++ b/commit.h @@ -359,6 +359,8 @@ struct merge_remote_desc { const char *name; }; #define merge_remote_util(commit) ((struct merge_remote_desc *)((commit)->util)) +extern void set_merge_remote_desc(struct commit *commit, + const char *name, struct object *obj); /* * Given "name" from the command line to merge, find the commit object -- cgit v1.2.3 From 5447a76aad4074c31e7c8a6299cc586435f385e9 Mon Sep 17 00:00:00 2001 From: René Scharfe Date: Sat, 13 Aug 2016 14:21:27 +0200 Subject: commit: use FLEX_ARRAY in struct merge_remote_desc Convert the name member of struct merge_remote_desc to a FLEX_ARRAY and use FLEX_ALLOC_STR to build the struct. This halves the number of memory allocations, saves the storage for a pointer and avoids an indirection when reading the name. Suggested-by: Jeff King Signed-off-by: Rene Scharfe Reviewed-by: Jeff King Signed-off-by: Junio C Hamano --- commit.c | 3 +-- commit.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'commit.c') diff --git a/commit.c b/commit.c index fc3d6fb2c3..5f616b7201 100644 --- a/commit.c +++ b/commit.c @@ -1580,9 +1580,8 @@ void set_merge_remote_desc(struct commit *commit, const char *name, struct object *obj) { struct merge_remote_desc *desc; - desc = xmalloc(sizeof(*desc)); + FLEX_ALLOC_STR(desc, name, name); desc->obj = obj; - desc->name = xstrdup(name); commit->util = desc; } diff --git a/commit.h b/commit.h index ed2a1f0265..15ee924f2f 100644 --- a/commit.h +++ b/commit.h @@ -356,7 +356,7 @@ extern void for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void * struct merge_remote_desc { struct object *obj; /* the named object, could be a tag */ - const char *name; + char name[FLEX_ARRAY]; }; #define merge_remote_util(commit) ((struct merge_remote_desc *)((commit)->util)) extern void set_merge_remote_desc(struct commit *commit, -- cgit v1.2.3