diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-08 21:36:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-08 21:36:00 -0700 |
| commit | 9bef64223606a2c5fdc696745ce02b4af62bda90 (patch) | |
| tree | caaa4011d093adb2569ecaca4705d48b55ee9f66 | |
| parent | 5e469ab66c86d5178aae71cacf9f55c3b378de03 (diff) | |
| parent | ddd0bfac7cfaabc7c0422ecee9604ede9c4841d1 (diff) | |
| download | git-9bef64223606a2c5fdc696745ce02b4af62bda90.tar.gz | |
Merge branch 'jk/tighten-alloc' into maint
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.c | 4 | ||||
| -rw-r--r-- | git-compat-util.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index a744437b58..05d04400f5 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -1375,11 +1375,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 9eab471264..b4b7f44952 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -802,7 +802,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). |