Merge branch 'unify-parser'

* unify-parser:
  abrt-server uses new parser
  abrt-action-save-package-data uses new parser
  use a new INTEGER option
  abrt-action-generate-backtrace uses new parser

1 files changed, 1 insertions, 11 deletions

diff --git a/src/daemon/Daemon.cpp b/src/daemon/Daemon.cpp
index 548067bd..eb1e21fc 100644
--- a/src/daemon/Daemon.cpp
+++ b/src/daemon/Daemon.cpp
@@ -872,7 +872,7 @@ static struct options abrtd_options[] = {
     OPT_BOOL( 'h' , "help", &help_opt, _("Show this help message")),
     OPT_BOOL( 'd' , 0, &daemonize_opt, _("Do not daemonize")),
     OPT_BOOL( 's' , 0, &syslog_opt, _("Log to syslog even with -d")),
-    OPT_STRING( 't' , 0, &timeout_opt, "sec",  _("Exit after SEC seconds of inactivity")),
+    OPT_INTEGER( 't' , 0, &timeout_opt, _("Exit after SEC seconds of inactivity")),
     OPT_BOOL( 'v' , 0, &g_verbose, _("Verbose")),
     OPT_END()
 };
@@ -906,16 +906,6 @@ int main(int argc, char** argv)
     if (syslog_opt)
         start_syslog_logging();
 
-    if (timeout_opt)
-    {
-        unsigned long ul;
-        char *end;
-        errno = 0;
-        s_timeout = ul = strtoul(timeout_opt, &end, 0);
-        if (!(errno == 0 && *end == '\0' && ul <= INT_MAX))
-            parse_usage_and_die(abrtd_usage, abrtd_options);
-    }
-
     putenv(xasprintf("ABRT_VERBOSE=%u", g_verbose));
 
     msg_prefix = "abrtd"; /* for log(), error_msg() and such */