diff options
| author | Denys Vlasenko <dvlasenk@redhat.com> | 2010-10-08 16:18:24 +0200 |
|---|---|---|
| committer | Denys Vlasenko <dvlasenk@redhat.com> | 2010-10-08 16:18:24 +0200 |
| commit | de6c4a0903325d14fed89de6cef2572dc141c2fe (patch) | |
| tree | 555cdf7408df9d26a18f71635a7fdf2cd22e686f /src | |
| parent | 81df7a41538faa1f4fbfb54ea33e1448d70cfc76 (diff) | |
Remove arrays in usage text, use a single string instead
Currently, usage is an array of pointers to string.
It is meant to support this:
usage: foo --bar
or: foo --baz
or: foo -z
The patch removes this and makes usage just a string:
usage: foo --bar
Why remove this?
(1) We can achieve old format by using the usage string with many lines:
usage = "foo --bar\n"
" or: foo --baz\n"
" or: foo -z";
(2) We don't use multi-line usage anyway.
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/daemon/Daemon.cpp | 5 | ||||
| -rw-r--r-- | src/daemon/abrt-action-generate-backtrace.c | 5 | ||||
| -rw-r--r-- | src/daemon/abrt-action-save-package-data.cpp | 5 | ||||
| -rw-r--r-- | src/daemon/abrt-server.c | 5 |
4 files changed, 4 insertions, 16 deletions
diff --git a/src/daemon/Daemon.cpp b/src/daemon/Daemon.cpp index 3689a42b..f6073134 100644 --- a/src/daemon/Daemon.cpp +++ b/src/daemon/Daemon.cpp @@ -863,10 +863,7 @@ static void sanitize_dump_dir_rights() static int daemonize_opt, syslog_opt; static char *timeout_opt; -static const char * const abrtd_usage[] = { - _("abrtd [options]"), - NULL -}; +static const char* abrtd_usage = _("abrtd [options]"); static struct options abrtd_options[] = { OPT__VERBOSE(&g_verbose), diff --git a/src/daemon/abrt-action-generate-backtrace.c b/src/daemon/abrt-action-generate-backtrace.c index a031aabd..1a104ad7 100644 --- a/src/daemon/abrt-action-generate-backtrace.c +++ b/src/daemon/abrt-action-generate-backtrace.c @@ -243,10 +243,7 @@ static char *get_backtrace(struct dump_dir *dd) static char *d_opt, *i_opt; static int s_opt; -static const char * const abrt_action_generage_backtrace_usage[] = { - "abrt-action-generate-backtrace [options] -d DIR", - NULL -}; +static const char abrt_action_generage_backtrace_usage[] = "abrt-action-generate-backtrace [options] -d DIR"; static struct options abrt_action_generate_backtrace_options[] = { OPT__VERBOSE(&g_verbose), diff --git a/src/daemon/abrt-action-save-package-data.cpp b/src/daemon/abrt-action-save-package-data.cpp index 5a5114d8..d72f46c0 100644 --- a/src/daemon/abrt-action-save-package-data.cpp +++ b/src/daemon/abrt-action-save-package-data.cpp @@ -270,10 +270,7 @@ static int SavePackageDescriptionToDebugDump(const char *dump_dir_name) static char *d_opt; static int s_opt; -static const char * const abrt_action_save_package_data_usage[] = { - "abrt-action-save-package-data [options] -d DIR", - NULL -}; +static const char abrt_action_save_package_data_usage[] = "abrt-action-save-package-data [options] -d DIR"; static struct options abrt_action_save_package_data_options[] = { OPT__VERBOSE(&g_verbose), diff --git a/src/daemon/abrt-server.c b/src/daemon/abrt-server.c index 32fd9aa9..b25d431d 100644 --- a/src/daemon/abrt-server.c +++ b/src/daemon/abrt-server.c @@ -279,10 +279,7 @@ static void dummy_handler(int sig_unused) {} static int s_opt; -static const char * const abrt_server_usage[] = { - "abrt-server [options]", - NULL -}; +static const char abrt_server_usage[] = "abrt-server [options]"; static struct options abrt_server_options[] = { OPT__VERBOSE(&g_verbose), |