check_everything_connected: convert to argv_array
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>
Jeff King committed
Jul 15, 2016 at 06:28 UTC
3be89f9b86cb3891a7865ad004230a50977e3d8c
1 file changed
+9
-12
connected.c
+9
-12
@@ -26,10 +26,9 @@ static int check_everything_connected_real(sha1_iterate_fn fn,
26
const char *shallow_file)
27
{
28
struct child_process rev_list = CHILD_PROCESS_INIT;
29
- const char *argv[9];
29
char commit[41];
30
unsigned char sha1[20];
32
- int err = 0, ac = 0;
31
+ int err = 0;
32
struct packed_git *new_pack = NULL;
33
size_t base_len;
34
@@ -48,18 +47,16 @@ static int check_everything_connected_real(sha1_iterate_fn fn,
47
}
48
49
if (shallow_file) {
51
- argv[ac++] = "--shallow-file";
52
- argv[ac++] = shallow_file;
50
+ argv_array_push(&rev_list.args, "--shallow-file");
51
+ argv_array_push(&rev_list.args, shallow_file);
52
}
54
- argv[ac++] = "rev-list";
55
- argv[ac++] = "--objects";
56
- argv[ac++] = "--stdin";
57
- argv[ac++] = "--not";
58
- argv[ac++] = "--all";
59
- argv[ac++] = "--quiet";
60
- argv[ac] = NULL;
53
+ argv_array_push(&rev_list.args,"rev-list");
54
+ argv_array_push(&rev_list.args, "--objects");
55
+ argv_array_push(&rev_list.args, "--stdin");
56
+ argv_array_push(&rev_list.args, "--not");
57
+ argv_array_push(&rev_list.args, "--all");
58
+ argv_array_push(&rev_list.args, "--quiet");
59
62
- rev_list.argv = argv;
60
rev_list.git_cmd = 1;
61
rev_list.in = -1;
62
rev_list.no_stdout = 1;