- dummy report-only command line option removed - report-newt has never executed any analyze event
Signed-off-by: Jakub Filak <[email protected]> --- src/report-newt/report-newt.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/report-newt/report-newt.c b/src/report-newt/report-newt.c index 034beac..3a94896 100644 --- a/src/report-newt/report-newt.c +++ b/src/report-newt/report-newt.c @@ -379,28 +379,24 @@ int main(int argc, char **argv) /* Can't keep these strings/structs static: _() doesn't support that */ const char *program_usage_string = _( - "& -o [-d] DIR\n" + "& [-d] DIR\n" "\n" "newt tool to report problem saved in specified DIR" ); enum { - OPT_o = 1 << 0, // report only - OPT_r = 1 << 1, - OPT_V = 1 << 2, + OPT_r = 1 << 0, + OPT_V = 1 << 1, }; /* Keep enum above and order of options below in sync! */ struct options program_options[] = { - OPT_BOOL('o', "report-only", NULL, _("Skip analyze steps, go through report steps only")), OPT_BOOL('d', "delete", NULL, _("Remove DIR after reporting")), OPT_BOOL('V', "version", NULL, _("Display version and exit")), OPT_END() }; unsigned opts = parse_opts(argc, argv, program_options, program_usage_string); argv += optind; - /* zero or >1 arguments with -o, or >0 arguments with -V */ - if (!(opts & (OPT_o | OPT_V)) || - ((opts & OPT_o) && (!argv[0] || argv[1])) || - ((opts & OPT_V) && argv[0])) + /* >0 arguments with -V */ + if ((opts & OPT_V) && argv[0]) show_usage_and_die(program_usage_string, program_options); if (opts & OPT_V) -- 1.7.10.4
