diff --git a/zdump/opts.c b/zdump/opts.c index f1d3033d..f3ed219f 100644 --- a/zdump/opts.c +++ b/zdump/opts.c @@ -85,7 +85,7 @@ const char *OPTS_SELECT_ALL = "all"; static void init_defaults(struct options *opts) { opts->prog_name = "zgetdump"; - opts->action = ZG_ACTION_STDOUT; + opts->action = ZG_ACTION_COPY; #ifdef __s390x__ opts->fmt = "elf"; #else @@ -201,7 +201,7 @@ static void verify_opts(struct options *opts) { if (opts->select_specified) { if (opts->action != ZG_ACTION_MOUNT && - opts->action != ZG_ACTION_STDOUT && + opts->action != ZG_ACTION_COPY && opts->action != ZG_ACTION_DUMP_INFO) ERR_EXIT("The \"--select\" option can only be " "specified for info, mount, or copy"); @@ -228,7 +228,7 @@ static void parse_pos_args(struct options *opts, char *argv[], int argc) int pos_args = argc - optind; switch (opts->action) { - case ZG_ACTION_STDOUT: + case ZG_ACTION_COPY: case ZG_ACTION_DUMP_INFO: case ZG_ACTION_DEVICE_INFO: if (pos_args == 0) diff --git a/zdump/zg.h b/zdump/zg.h index efde05bc..93f66f1b 100644 --- a/zdump/zg.h +++ b/zdump/zg.h @@ -188,7 +188,7 @@ extern enum zg_type zg_type(struct zg_fh *zg_fh); * zgetdump actions */ enum zg_action { - ZG_ACTION_STDOUT, + ZG_ACTION_COPY, ZG_ACTION_DUMP_INFO, ZG_ACTION_DEVICE_INFO, ZG_ACTION_MOUNT, diff --git a/zdump/zgetdump.c b/zdump/zgetdump.c index bdeff284..c645e5bf 100644 --- a/zdump/zgetdump.c +++ b/zdump/zgetdump.c @@ -159,7 +159,7 @@ static int do_mount(void) /* * Run "copy to stdout" action */ -static int do_stdout(void) +static int do_copy(void) { int rc; @@ -184,8 +184,8 @@ int main(int argc, char *argv[]) ERR_EXIT("Invalid target format \"%s\" specified", g.opts.fmt); switch (g.opts.action) { - case ZG_ACTION_STDOUT: - return do_stdout(); + case ZG_ACTION_COPY: + return do_copy(); case ZG_ACTION_DUMP_INFO: return do_dump_info(); case ZG_ACTION_DEVICE_INFO: