Skip to content

Commit

Permalink
use args member of struct child_process
Browse files Browse the repository at this point in the history 
Convert users of struct child_process to using the managed argv_array
args instead of providing their own.  This shortens the code a bit and
ensures that the allocated memory is released automatically after use.

Suggested-by: Jeff King <peff@peff.net>
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
René Scharfe authored and Junio C Hamano committed Nov 10, 2014
1 parent 66edfe9 commit a2bae2d
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 35 deletions.
47 changes: 22 additions & 25 deletions builtin/repack.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
};
struct child_process cmd = CHILD_PROCESS_INIT;
struct string_list_item *item;
struct argv_array cmd_args = ARGV_ARRAY_INIT;
struct string_list names = STRING_LIST_INIT_DUP;
struct string_list rollback = STRING_LIST_INIT_NODUP;
struct string_list existing_packs = STRING_LIST_INIT_DUP;
Expand Down Expand Up @@ -202,56 +201,55 @@ int cmd_repack(int argc, const char **argv, const char *prefix)

sigchain_push_common(remove_pack_on_signal);

argv_array_push(&cmd_args, "pack-objects");
argv_array_push(&cmd_args, "--keep-true-parents");
argv_array_push(&cmd.args, "pack-objects");
argv_array_push(&cmd.args, "--keep-true-parents");
if (!pack_kept_objects)
argv_array_push(&cmd_args, "--honor-pack-keep");
argv_array_push(&cmd_args, "--non-empty");
argv_array_push(&cmd_args, "--all");
argv_array_push(&cmd_args, "--reflog");
argv_array_push(&cmd_args, "--indexed-objects");
argv_array_push(&cmd.args, "--honor-pack-keep");
argv_array_push(&cmd.args, "--non-empty");
argv_array_push(&cmd.args, "--all");
argv_array_push(&cmd.args, "--reflog");
argv_array_push(&cmd.args, "--indexed-objects");
if (window)
argv_array_pushf(&cmd_args, "--window=%s", window);
argv_array_pushf(&cmd.args, "--window=%s", window);
if (window_memory)
argv_array_pushf(&cmd_args, "--window-memory=%s", window_memory);
argv_array_pushf(&cmd.args, "--window-memory=%s", window_memory);
if (depth)
argv_array_pushf(&cmd_args, "--depth=%s", depth);
argv_array_pushf(&cmd.args, "--depth=%s", depth);
if (max_pack_size)
argv_array_pushf(&cmd_args, "--max-pack-size=%s", max_pack_size);
argv_array_pushf(&cmd.args, "--max-pack-size=%s", max_pack_size);
if (no_reuse_delta)
argv_array_pushf(&cmd_args, "--no-reuse-delta");
argv_array_pushf(&cmd.args, "--no-reuse-delta");
if (no_reuse_object)
argv_array_pushf(&cmd_args, "--no-reuse-object");
argv_array_pushf(&cmd.args, "--no-reuse-object");
if (write_bitmaps)
argv_array_push(&cmd_args, "--write-bitmap-index");
argv_array_push(&cmd.args, "--write-bitmap-index");

if (pack_everything & ALL_INTO_ONE) {
get_non_kept_pack_filenames(&existing_packs);

if (existing_packs.nr && delete_redundant) {
if (unpack_unreachable)
argv_array_pushf(&cmd_args,
argv_array_pushf(&cmd.args,
"--unpack-unreachable=%s",
unpack_unreachable);
else if (pack_everything & LOOSEN_UNREACHABLE)
argv_array_push(&cmd_args,
argv_array_push(&cmd.args,
"--unpack-unreachable");
}
} else {
argv_array_push(&cmd_args, "--unpacked");
argv_array_push(&cmd_args, "--incremental");
argv_array_push(&cmd.args, "--unpacked");
argv_array_push(&cmd.args, "--incremental");
}

if (local)
argv_array_push(&cmd_args, "--local");
argv_array_push(&cmd.args, "--local");
if (quiet)
argv_array_push(&cmd_args, "--quiet");
argv_array_push(&cmd.args, "--quiet");
if (delta_base_offset)
argv_array_push(&cmd_args, "--delta-base-offset");
argv_array_push(&cmd.args, "--delta-base-offset");

argv_array_push(&cmd_args, packtmp);
argv_array_push(&cmd.args, packtmp);

cmd.argv = cmd_args.argv;
cmd.git_cmd = 1;
cmd.out = -1;
cmd.no_stdin = 1;
Expand All @@ -270,7 +268,6 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
ret = finish_command(&cmd);
if (ret)
return ret;
argv_array_clear(&cmd_args);

if (!names.nr && !quiet)
printf("Nothing new to pack.\n");
Expand Down
17 changes: 7 additions & 10 deletions wt-status.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,6 @@ static void wt_status_print_changed(struct wt_status *s)
static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitted)
{
struct child_process sm_summary = CHILD_PROCESS_INIT;
struct argv_array argv = ARGV_ARRAY_INIT;
struct strbuf cmd_stdout = STRBUF_INIT;
struct strbuf summary = STRBUF_INIT;
char *summary_content;
Expand All @@ -735,23 +734,21 @@ static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitt
argv_array_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s",
s->index_file);

argv_array_push(&argv, "submodule");
argv_array_push(&argv, "summary");
argv_array_push(&argv, uncommitted ? "--files" : "--cached");
argv_array_push(&argv, "--for-status");
argv_array_push(&argv, "--summary-limit");
argv_array_pushf(&argv, "%d", s->submodule_summary);
argv_array_push(&sm_summary.args, "submodule");
argv_array_push(&sm_summary.args, "summary");
argv_array_push(&sm_summary.args, uncommitted ? "--files" : "--cached");
argv_array_push(&sm_summary.args, "--for-status");
argv_array_push(&sm_summary.args, "--summary-limit");
argv_array_pushf(&sm_summary.args, "%d", s->submodule_summary);
if (!uncommitted)
argv_array_push(&argv, s->amend ? "HEAD^" : "HEAD");
argv_array_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD");

sm_summary.argv = argv.argv;
sm_summary.git_cmd = 1;
sm_summary.no_stdin = 1;
fflush(s->fp);
sm_summary.out = -1;

run_command(&sm_summary);
argv_array_clear(&argv);

len = strbuf_read(&cmd_stdout, sm_summary.out, 1024);

Expand Down

0 comments on commit a2bae2d

Please sign in to comment.