mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check_everything_connected: convert to argv_array

Browse Source 
This avoids the magic "9" array-size which we must avoid
overflowing, making further patches simpler.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2016-07-15 06:28:32 -04:00
committed by Junio C Hamano
parent 434ea3cdad
commit 3be89f9b86
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
connected.c
View File

@ -26,10 +26,9 @@ static int check_everything_connected_real(sha1_iterate_fn fn,
const char *shallow_file) const char *shallow_file)
{ {
struct child_process rev_list = CHILD_PROCESS_INIT; struct child_process rev_list = CHILD_PROCESS_INIT;
const char *argv[9];
char commit[41]; char commit[41];
unsigned char sha1[20]; unsigned char sha1[20];
int err = 0, ac = 0; int err = 0;
struct packed_git *new_pack = NULL; struct packed_git *new_pack = NULL;
size_t base_len; size_t base_len;
@ -48,18 +47,16 @@ static int check_everything_connected_real(sha1_iterate_fn fn,
} }
if (shallow_file) { if (shallow_file) {
argv[ac++] = "--shallow-file"; argv_array_push(&rev_list.args, "--shallow-file");
argv[ac++] = shallow_file; argv_array_push(&rev_list.args, shallow_file);
} }
argv[ac++] = "rev-list"; argv_array_push(&rev_list.args,"rev-list");
argv[ac++] = "--objects"; argv_array_push(&rev_list.args, "--objects");
argv[ac++] = "--stdin"; argv_array_push(&rev_list.args, "--stdin");
argv[ac++] = "--not"; argv_array_push(&rev_list.args, "--not");
argv[ac++] = "--all"; argv_array_push(&rev_list.args, "--all");
argv[ac++] = "--quiet"; argv_array_push(&rev_list.args, "--quiet");
argv[ac] = NULL;
rev_list.argv = argv;
rev_list.git_cmd = 1; rev_list.git_cmd = 1;
rev_list.in = -1; rev_list.in = -1;
rev_list.no_stdout = 1; rev_list.no_stdout = 1;