bundle: use internal argv_array of struct child_process in create_bundle()
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>
René Scharfe committed
Jul 18, 2014 at 01:27 UTC
92859f3a7906cf1a1d398307ba21a062984550d6
1 file changed
+5
-10
bundle.c
+5
-10
@@ -237,8 +237,6 @@ int create_bundle(struct bundle_header *header, const char *path,
237
static struct lock_file lock;
238
int bundle_fd = -1;
239
int bundle_to_stdout;
240
- struct argv_array argv_boundary = ARGV_ARRAY_INIT;
241
- struct argv_array argv_pack = ARGV_ARRAY_INIT;
240
int i, ref_count = 0;
241
struct strbuf buf = STRBUF_INIT;
242
struct rev_info revs;
@@ -260,14 +258,12 @@ int create_bundle(struct bundle_header *header, const char *path,
258
init_revisions(&revs, NULL);
259
260
/* write prerequisites */
263
- argv_array_pushl(&argv_boundary,
261
+ memset(&rls, 0, sizeof(rls));
262
+ argv_array_pushl(&rls.args,
263
"rev-list", "--boundary", "--pretty=oneline",
264
NULL);
265
for (i = 1; i < argc; i++)
267
- argv_array_push(&argv_boundary, argv[i]);
268
-
269
- memset(&rls, 0, sizeof(rls));
270
- rls.argv = argv_boundary.argv;
266
+ argv_array_push(&rls.args, argv[i]);
267
rls.out = -1;
268
rls.git_cmd = 1;
269
if (start_command(&rls))
@@ -382,12 +378,11 @@ int create_bundle(struct bundle_header *header, const char *path,
378
write_or_die(bundle_fd, "\n", 1);
379
380
/* write pack */
385
- argv_array_pushl(&argv_pack,
381
+ memset(&rls, 0, sizeof(rls));
382
+ argv_array_pushl(&rls.args,
383
"pack-objects", "--all-progress-implied",
384
"--stdout", "--thin", "--delta-base-offset",
385
NULL);
389
- memset(&rls, 0, sizeof(rls));
390
- rls.argv = argv_pack.argv;
386
rls.in = -1;
387
rls.out = bundle_fd;
388
rls.git_cmd = 1;