From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: util-linux-owner@vger.kernel.org Received: from mail-wg0-f41.google.com ([74.125.82.41]:55180 "EHLO mail-wg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755036Ab3FBRwb (ORCPT ); Sun, 2 Jun 2013 13:52:31 -0400 Received: by mail-wg0-f41.google.com with SMTP id k13so2046713wgh.2 for ; Sun, 02 Jun 2013 10:52:29 -0700 (PDT) From: Sami Kerola To: util-linux@vger.kernel.org Cc: kerolasa@iki.fi Subject: [PATCH 17/19] dmesg: make usage() a little bit shorter Date: Sun, 2 Jun 2013 18:51:23 +0100 Message-Id: <1370195485-27907-18-git-send-email-kerolasa@iki.fi> In-Reply-To: <1370195485-27907-1-git-send-email-kerolasa@iki.fi> References: <1370195485-27907-1-git-send-email-kerolasa@iki.fi> Sender: util-linux-owner@vger.kernel.org List-ID: The dmesg has rather long usage, so drop the timestamp format options which are aliases of the more generic options. Old options will remain working as earlier. Signed-off-by: Sami Kerola --- sys-utils/dmesg.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c index adfd6a5..d80b3e9 100644 --- a/sys-utils/dmesg.c +++ b/sys-utils/dmesg.c @@ -234,8 +234,6 @@ static void __attribute__((__noreturn__)) usage(FILE *out) fputs(_(" -C, --clear clear the kernel ring buffer\n"), out); fputs(_(" -c, --read-clear read and clear all messages\n"), out); fputs(_(" -D, --console-off disable printing messages to console\n"), out); - fputs(_(" -d, --show-delta show time delta between printed messages\n"), out); - fputs(_(" -e, --reltime show local time and time delta in readable format\n"), out); fputs(_(" -E, --console-on enable printing messages to console\n"), out); fputs(_(" -F, --file use the file instead of the kernel log buffer\n"), out); fputs(_(" -f, --facility restrict output to defined facilities\n"), out); @@ -248,14 +246,12 @@ static void __attribute__((__noreturn__)) usage(FILE *out) fputs(_(" -r, --raw print the raw message buffer\n"), out); fputs(_(" -S, --syslog force to use syslog(2) rather than /dev/kmsg\n"), out); fputs(_(" -s, --buffer-size buffer size to query the kernel ring buffer\n"), out); - fputs(_(" -T, --ctime show human readable timestamp (could be \n" - " inaccurate if you have used SUSPEND/RESUME)\n"), out); - fputs(_(" -t, --notime don't print messages timestamp\n"), out); fputs(_(" -u, --userspace display userspace messages\n"), out); fputs(_(" -w, --follow wait for new messages\n"), out); fputs(_(" -x, --decode decode facility and level to readable string\n"), out); fputs(_(" --time-format show time stamp using format:\n" - " [notime|ctime|delta|reltime|iso]\n"), out); + " [notime|ctime|delta|reltime|iso]\n" + "Suspending/resume will make ctime and iso timestamps inaccurate.\n"), out); fputs(USAGE_SEPARATOR, out); fputs(USAGE_HELP, out); fputs(USAGE_VERSION, out); -- 1.8.3