undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/tighten-alloc' into maint

Browse Source 
Small code and comment clean-up.

* jk/tighten-alloc:
  receive-pack: use FLEX_ALLOC_MEM in queue_command()
  correct FLEXPTR_* example in comment
This commit is contained in:
Junio C Hamano 2016-09-08 21:36:00 -07:00
commit 9bef642236
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/receive-pack.c
View File

@ -1375,11 +1375,9 @@ static struct command **queue_command(struct command **tail,
refname = line + 82; refname = line + 82;
reflen = linelen - 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->old_sha1, old_sha1);
hashcpy(cmd->new_sha1, new_sha1); hashcpy(cmd->new_sha1, new_sha1);
memcpy(cmd->ref_name, refname, reflen);
cmd->ref_name[reflen] = '\0';
*tail = cmd; *tail = cmd;
return &cmd->next; return &cmd->next;
} }

2
git-compat-util.h
View File

@ -802,7 +802,7 @@ extern FILE *fopen_for_writing(const char *path);
* you can do: * you can do:
* *
* struct foo *f; * 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 * 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). * freed along with the struct (but the pointer can be repointed anywhere).