add --help option in parse_opts(), not at every call site.

This patch removes the need to add --help option to every program.
It is added (and handled) by parse_opts().

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

1 files changed, 6 insertions, 10 deletions

diff --git a/src/daemon/Daemon.cpp b/src/daemon/Daemon.cpp
index aa3cae4c..3689a42b 100644
--- a/src/daemon/Daemon.cpp
+++ b/src/daemon/Daemon.cpp
@@ -85,11 +85,6 @@ using namespace std;
  *      Both are sent as unicast to last client set by set_client_name(name).
  *      If set_client_name(NULL) was done, they are not sent.
  */
-static const char * const abrtd_usage[] = {
-    _("abrtd [options]"),
-    NULL
-};
-
 CCommLayerServer* g_pCommLayer;
 
 static bool daemonize = true;
@@ -865,11 +860,15 @@ static void sanitize_dump_dir_rights()
     ensure_writable_dir(VAR_RUN"/abrt", 0755, "root");
 }
 
-static int daemonize_opt, syslog_opt, help_opt;
+static int daemonize_opt, syslog_opt;
 static char *timeout_opt;
 
+static const char * const abrtd_usage[] = {
+    _("abrtd [options]"),
+    NULL
+};
+
 static struct options abrtd_options[] = {
-    OPT__HELP(&help_opt),
     OPT__VERBOSE(&g_verbose),
     OPT_GROUP(""),
     OPT_BOOL( 'd' , 0, &daemonize_opt, _("Do not daemonize")),
@@ -898,9 +897,6 @@ int main(int argc, char** argv)
 
     parse_opts(argc, argv, abrtd_options, abrtd_usage);
 
-    if (help_opt)
-        parse_usage_and_die(abrtd_usage, abrtd_options);
-
     if (daemonize_opt)
         daemonize = false;