5f6d67b7d
Bernhard Reutner-Fischer
2006-06-03
Subject
- no need to have timer_duration in the data section. - cleanup a little bit while at it.
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
miscutils/watchdog.c+4 -7
| @@ -3,6 +3,7 @@ | |
| * Mini watchdog implementation for busybox | |
| * | |
| * Copyright (C) 2003 Paul Mundt <[email protected]> | |
| + | * Copyright (C) 2006 Bernhard Fischer <[email protected]> |
| * | |
| * 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 .. */ | |