summaryrefslogtreecommitdiff
path: root/builtin-fmt-merge-msg.c
diff options
context:
space:
mode:
authorJonas Fonseca <fonseca@diku.dk>2006-08-26 14:16:18 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-08-27 00:54:06 (GMT)
commit83572c1a914d3f7a8dd66d954c11bbc665b7b923 (patch)
treebae4dc57d36b83c835253498dfdabd29d4dec66e /builtin-fmt-merge-msg.c
parent095c424d08d96a5f9ee3ca53ae952e92c5cff99b (diff)
downloadgit-83572c1a914d3f7a8dd66d954c11bbc665b7b923.zip
git-83572c1a914d3f7a8dd66d954c11bbc665b7b923.tar.gz
git-83572c1a914d3f7a8dd66d954c11bbc665b7b923.tar.bz2
Use xrealloc instead of realloc
Change places that use realloc, without a proper error path, to instead use xrealloc. Drop an erroneous error path in the daemon code that used errno in the die message in favour of the simpler xrealloc. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-fmt-merge-msg.c')
-rw-r--r--builtin-fmt-merge-msg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c
index 28b5dfd..a5ed8db 100644
--- a/builtin-fmt-merge-msg.c
+++ b/builtin-fmt-merge-msg.c
@@ -27,8 +27,8 @@ static void append_to_list(struct list *list, char *value, void *payload)
{
if (list->nr == list->alloc) {
list->alloc += 32;
- list->list = realloc(list->list, sizeof(char *) * list->alloc);
- list->payload = realloc(list->payload,
+ list->list = xrealloc(list->list, sizeof(char *) * list->alloc);
+ list->payload = xrealloc(list->payload,
sizeof(char *) * list->alloc);
}
list->payload[list->nr] = payload;