summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-17 21:07:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-08-17 21:07:46 (GMT)
commit2f664566c56db3ddbf12033c2b8f8091b693dc79 (patch)
treec886a3815c3c71e5c25042e55ab151e67ee3348f
parenta6711ed714d5312ebe495b026ce66f6b2ae890e2 (diff)
parentddd0bfac7cfaabc7c0422ecee9604ede9c4841d1 (diff)
downloadgit-2f664566c56db3ddbf12033c2b8f8091b693dc79.zip
git-2f664566c56db3ddbf12033c2b8f8091b693dc79.tar.gz
git-2f664566c56db3ddbf12033c2b8f8091b693dc79.tar.bz2
Merge branch 'jk/tighten-alloc'
Small code and comment clean-up. * jk/tighten-alloc: receive-pack: use FLEX_ALLOC_MEM in queue_command() correct FLEXPTR_* example in comment
-rw-r--r--builtin/receive-pack.c4
-rw-r--r--git-compat-util.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 92e1213..011db00 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -1478,11 +1478,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;
}
diff --git a/git-compat-util.h b/git-compat-util.h
index 590bfdd..f52e00b 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -815,7 +815,7 @@ extern FILE *fopen_for_writing(const char *path);
* you can do:
*
* struct foo *f;
- * FLEX_ALLOC_STR(f, name, src);
+ * FLEXPTR_ALLOC_STR(f, name, src);
*
* and "name" will point to a block of memory after the struct, which will be
* freed along with the struct (but the pointer can be repointed anywhere).