diff options
| author | Karel Zak | 2012-05-04 11:02:47 +0200 |
|---|---|---|
| committer | Karel Zak | 2012-05-04 11:02:47 +0200 |
| commit | 3dd00e0773a3844a0e9c816121c25507e8718c00 (patch) | |
| tree | aa99f7a49b5507d3c256c374267fa81f0fc8d395 /sys-utils/wdctl.c | |
| parent | wdctl: rewrite to use lib/tt (diff) | |
| download | kernel-qcow2-util-linux-3dd00e0773a3844a0e9c816121c25507e8718c00.tar.gz kernel-qcow2-util-linux-3dd00e0773a3844a0e9c816121c25507e8718c00.tar.xz kernel-qcow2-util-linux-3dd00e0773a3844a0e9c816121c25507e8718c00.zip | |
wdctl: make timeouts output more parsable
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'sys-utils/wdctl.c')
| -rw-r--r-- | sys-utils/wdctl.c | 40 |
1 files changed, 7 insertions, 33 deletions
diff --git a/sys-utils/wdctl.c b/sys-utils/wdctl.c index 1192348f3..510cbeaf1 100644 --- a/sys-utils/wdctl.c +++ b/sys-utils/wdctl.c @@ -1,5 +1,3 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: t -*-*/ - /* * wdctl(8) - show hardware watchdog status * @@ -20,7 +18,6 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - #include <linux/watchdog.h> #include <sys/ioctl.h> #include <getopt.h> @@ -318,36 +315,12 @@ static int read_watchdog(struct wdinfo *wd) static void show_timeouts(struct wdinfo *wd) { - const char *sep; - - if (!wd->has_timeout && !wd->has_pretimeout && !wd->has_timeleft) - return; - - if (wd->has_timeout) { - printf(_("Timeout")); - sep = "/"; - } - if (wd->has_pretimeout) { - printf(_("%sPre-timeout"), sep); - sep = "/"; - } - if (wd->has_timeleft) - printf(_("%sTimeleft"), sep); - - fputs(": ", stdout); - sep = NULL; - if (wd->has_timeout) { - printf("%i", wd->timeout); - sep = "/"; - } - if (wd->has_pretimeout) { - printf("%s%i", sep, wd->pretimeout); - sep = "/"; - } + if (wd->has_timeout) + printf(_("%-15s%2i seconds\n"), _("Timeout:"), wd->timeout); + if (wd->has_pretimeout) + printf(_("%-15s%2i seconds\n"), _("Pre-timeout:"), wd->pretimeout); if (wd->has_timeleft) - printf("%s%i", sep, wd->timeleft); - - fputs(_(" seconds\n"), stdout); + printf(_("%-15s%2i seconds\n"), _("Timeleft:"), wd->timeleft); } int main(int argc, char *argv[]) @@ -444,7 +417,8 @@ int main(int argc, char *argv[]) goto done; if (!noident) - printf(_("Identity: %s [version %x]\n"), + printf(_("%-15s%s [version %x]\n"), + ("Identity:"), wd.ident.identity, wd.ident.firmware_version); if (!notimeouts) |