OSDN Git Service

receive-pack: use FLEX_ALLOC_MEM in queue_command()
authorRené Scharfe <l.s.r@web.de>
Sat, 13 Aug 2016 15:38:56 +0000 (17:38 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2016 02:49:30 +0000 (19:49 -0700)
Use the macro FLEX_ALLOC_MEM instead of open-coding it.  This shortens
and simplifies the code a bit.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/receive-pack.c

index c8e32b2..b55d0aa 100644 (file)
@@ -1372,11 +1372,9 @@ static struct command **queue_command(struct command **tail,
 
        refname = line + 82;
        reflen = linelen - 82;
-       cmd = xcalloc(1, st_add3(sizeof(struct command), reflen, 1));
+       FLEX_ALLOC_MEM(cmd, ref_name, refname, reflen);
        hashcpy(cmd->old_sha1, old_sha1);
        hashcpy(cmd->new_sha1, new_sha1);
-       memcpy(cmd->ref_name, refname, reflen);
-       cmd->ref_name[reflen] = '\0';
        *tail = cmd;
        return &cmd->next;
 }