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

bundle: use internal argv_array of struct child_process in create_bundle()

Browse Source 
Use the existing argv_array member instead of providing our own.  This
way the argv_array is cleared after use automatically for us; it was
leaking before.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2014-07-18 01:27:41 +02:00 committed by Junio C Hamano
parent 14576df044
commit 92859f3a79
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bundle.c
View File

@ -237,8 +237,6 @@ int create_bundle(struct bundle_header *header, const char *path,
static struct lock_file lock; static struct lock_file lock;
int bundle_fd = -1; int bundle_fd = -1;
int bundle_to_stdout; int bundle_to_stdout;
struct argv_array argv_boundary = ARGV_ARRAY_INIT;
struct argv_array argv_pack = ARGV_ARRAY_INIT;
int i, ref_count = 0; int i, ref_count = 0;
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
struct rev_info revs; struct rev_info revs;
@ -260,14 +258,12 @@ int create_bundle(struct bundle_header *header, const char *path,
init_revisions(&revs, NULL); init_revisions(&revs, NULL);
/* write prerequisites */ /* write prerequisites */
argv_array_pushl(&argv_boundary, memset(&rls, 0, sizeof(rls));
argv_array_pushl(&rls.args,
"rev-list", "--boundary", "--pretty=oneline", "rev-list", "--boundary", "--pretty=oneline",
NULL); NULL);
for (i = 1; i < argc; i++) for (i = 1; i < argc; i++)
argv_array_push(&argv_boundary, argv[i]); argv_array_push(&rls.args, argv[i]);
memset(&rls, 0, sizeof(rls));
rls.argv = argv_boundary.argv;
rls.out = -1; rls.out = -1;
rls.git_cmd = 1; rls.git_cmd = 1;
if (start_command(&rls)) if (start_command(&rls))
@ -382,12 +378,11 @@ int create_bundle(struct bundle_header *header, const char *path,
write_or_die(bundle_fd, "\n", 1); write_or_die(bundle_fd, "\n", 1);
/* write pack */ /* write pack */
argv_array_pushl(&argv_pack, memset(&rls, 0, sizeof(rls));
argv_array_pushl(&rls.args,
"pack-objects", "--all-progress-implied", "pack-objects", "--all-progress-implied",
"--stdout", "--thin", "--delta-base-offset", "--stdout", "--thin", "--delta-base-offset",
NULL); NULL);
memset(&rls, 0, sizeof(rls));
rls.argv = argv_pack.argv;
rls.in = -1; rls.in = -1;
rls.out = bundle_fd; rls.out = bundle_fd;
rls.git_cmd = 1; rls.git_cmd = 1;