- no need to have timer_duration in the data section.

- cleanup a little bit while at it.

diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index 6fcb8f83ce7e7a0f536aa9711d080892f036f578..55fee8a40cce6d121ed69f02cf6195539f8cd7df 100644 (file)
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -3,6 +3,7 @@
  * Mini watchdog implementation for busybox
  *
  * Copyright (C) 2003  Paul Mundt <lethal@linux-sh.org>
+ * Copyright (C) 2006  Bernhard Fischer <busybox@busybox.net>
  *
  * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
@@ -14,9 +15,6 @@
 #include <stdlib.h>
 #include <signal.h>
 
-/* Userspace timer duration, in seconds */
-static unsigned int timer_duration = 30;
-
 /* Watchdog file descriptor */
 static int fd;
 
@@ -29,11 +27,10 @@ static void watchdog_shutdown(int ATTRIBUTE_UNUSED unused)
 
 int watchdog_main(int argc, char **argv)
 {
-
+       unsigned long timer_duration = 30; /* Userspace timer duration, in seconds */
        char *t_arg;
-       unsigned long flags;
-       flags = bb_getopt_ulflags(argc, argv, "t:", &t_arg);
-       if (flags & 1)
+
+       if (bb_getopt_ulflags(argc, argv, "t:", &t_arg))
                timer_duration = bb_xgetlarg(t_arg, 10, 0, INT_MAX);
 
        /* We're only interested in the watchdog device .. */