From: J William Piggott <elseifthen@gmx.com>
To: Karel Zak <kzak@redhat.com>
Cc: util-linux@vger.kernel.org
Subject: [PATCH 02/12] hwclock: update usage() to util-linux style
Date: Sun, 18 Jun 2017 20:38:51 -0400 [thread overview]
Message-ID: <a3863911-bf34-a0da-8f67-b5600ea46cfc@gmx.com> (raw)
In-Reply-To: <011634ef-e5e7-354e-6064-3191450b4fc8@gmx.com>
Update usage() according to:
Documentation/howto-usage-function.txt
Documentation/boilerplate.c
Signed-off-by: J William Piggott <elseifthen@gmx.com>
---
sys-utils/hwclock.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index 4782318..d2f8ad1 100644
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -1206,11 +1206,11 @@ usage(const struct hwclock_control *ctl, FILE *usageto)
fputs(_(" hwclock [function] [option...]\n"), usageto);
fputs(USAGE_SEPARATOR, usageto);
- fputs(_("Query or set the hardware clock.\n"), usageto);
+ fputs(_(" Query or set the hardware clock\n"), usageto);
- fputs(_("\nFunctions:\n"), usageto);
- fputs(_(" -h, --help show this help text and exit\n"
- " -r, --show read hardware clock and print result\n"
+ fputs(USAGE_SEPARATOR, usageto);
+ fputs(_("Functions:\n"), usageto);
+ fputs(_(" -r, --show read hardware clock and print result\n"
" --get read hardware clock and print drift corrected result\n"
" --set set the RTC to the time given with --date\n"), usageto);
fputs(_(" -s, --hctosys set the system time from the hardware clock\n"
@@ -1223,8 +1223,7 @@ usage(const struct hwclock_control *ctl, FILE *usageto)
" --setepoch set the kernel's hardware clock epoch value to the \n"
" value given with --epoch\n"), usageto);
#endif
- fputs(_(" --predict predict RTC reading at time given with --date\n"
- " -V, --version display version information and exit\n"), usageto);
+ fputs(_(" --predict predict RTC reading at time given with --date\n"), usageto);
fputs(USAGE_OPTIONS, usageto);
fputs(_(" -u, --utc the hardware clock is kept in UTC\n"
@@ -1246,8 +1245,11 @@ usage(const struct hwclock_control *ctl, FILE *usageto)
" --adjfile <file> specifies the path to the adjust file;\n"
" the default is %1$s\n"), _PATH_ADJTIME);
fputs(_(" --test do not update anything, just show what would happen\n"
- " -D, --debug debugging mode\n" "\n"), usageto);
-
+ " -D, --debug debugging mode\n"), usageto);
+ fputs(USAGE_SEPARATOR, usageto);
+ fputs(USAGE_HELP, usageto);
+ fputs(USAGE_VERSION, usageto);
+ fprintf(usageto, USAGE_MAN_TAIL("hwclock(8)"));
hwclock_exit(ctl, EXIT_SUCCESS);
}
next prev parent reply other threads:[~2017-06-19 0:38 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-19 0:35 [PATCH 00/12] pull request J William Piggott
2017-06-19 0:37 ` [PATCH 01/12] hwclock: remove dead code in usage() J William Piggott
2017-06-19 0:38 ` J William Piggott [this message]
2017-06-19 0:40 ` [PATCH 03/12] hwclock: update usage() FILE name J William Piggott
2017-06-19 0:41 ` [PATCH 04/12] hwclock: add usage() functions heading J William Piggott
2017-06-20 8:36 ` Karel Zak
2017-06-21 0:59 ` J William Piggott
2017-06-21 12:21 ` Ruediger Meier
2017-06-21 15:59 ` J William Piggott
2017-06-19 0:42 ` [PATCH 05/12] include: update pathnames.h J William Piggott
2017-06-20 8:44 ` Karel Zak
2017-06-21 0:53 ` J William Piggott
2017-06-19 0:44 ` [PATCH 06/12] hwclock: use RTC in help output J William Piggott
2017-06-19 0:45 ` [PATCH 07/12] hwclock: update --help content and grammar J William Piggott
2017-06-20 8:51 ` Karel Zak
2017-06-21 0:53 ` J William Piggott
2017-06-21 13:05 ` Ruediger Meier
2017-06-21 14:55 ` Karel Zak
2017-06-21 15:30 ` J William Piggott
2017-06-22 2:04 ` Ruediger Meier
2017-06-22 18:46 ` J William Piggott
2017-06-21 15:01 ` Karel Zak
2017-06-21 17:02 ` J William Piggott
2017-06-19 0:46 ` [PATCH 08/12] hwclock: slice up the usage text J William Piggott
2017-06-19 0:47 ` [PATCH 09/12] hwclock: add --update-drift check J William Piggott
2017-06-19 0:48 ` [PATCH 10/12] Docs: update howto-usage-function.txt J William Piggott
2017-06-19 0:49 ` [PATCH 11/12] hwclock: remove unused usage() FILE argument J William Piggott
2017-06-20 8:56 ` Karel Zak
2017-06-21 0:52 ` J William Piggott
2017-06-28 19:29 ` fputs() vs puts() (was: [PATCH] hwclock: remove unused usage() FILE argument) Ruediger Meier
2017-06-29 8:51 ` Karel Zak
2017-06-29 10:37 ` Ruediger Meier
2017-06-29 10:53 ` Karel Zak
2017-06-29 14:46 ` fputs() vs puts() J William Piggott
2017-06-29 20:12 ` Karel Zak
2017-06-30 18:29 ` J William Piggott
2017-07-03 8:30 ` Ruediger Meier
2017-07-03 12:07 ` Karel Zak
2017-07-03 12:38 ` Ruediger Meier
2017-07-03 14:25 ` Karel Zak
2017-07-03 15:09 ` Bernhard Voelker
2017-07-03 15:15 ` Bernhard Voelker
2017-06-29 10:37 ` fputs() vs puts() (was: [PATCH] hwclock: remove unused usage() FILE argument) Karel Zak
2017-06-21 9:26 ` [PATCH 11/12] hwclock: remove unused usage() FILE argument Karel Zak
2017-06-21 15:48 ` J William Piggott
2017-06-25 21:39 ` J William Piggott
2017-06-19 0:51 ` [PATCH 12/12] hwclock: remove unused stdarg.h J William Piggott
2017-06-21 9:27 ` [PATCH 00/12] pull request Karel Zak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a3863911-bf34-a0da-8f67-b5600ea46cfc@gmx.com \
--to=elseifthen@gmx.com \
--cc=kzak@redhat.com \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).