From: "Michael Kerrisk (man-pages)" <mtk.manpages@gmail.com>
To: Masanari Iida <standby24x7@gmail.com>
Cc: mtk.manpages@gmail.com, linux-man@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/2] adjtimex.2: Update return value of adjtimex
Date: Tue, 06 Jan 2015 07:34:04 +0100 [thread overview]
Message-ID: <54AB81DC.2000308@gmail.com> (raw)
In-Reply-To: <1419426040-16090-1-git-send-email-standby24x7@gmail.com>
Hello Masanari Iida,
On 12/24/2014 02:00 PM, Masanari Iida wrote:
> This patch update return value of adjtimex man page.
>
> Signed-off-by: Masanari Iida <standby24x7@gmail.com>
> ---
> man2/adjtimex.2 | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/man2/adjtimex.2 b/man2/adjtimex.2
> index eb3fda1..f2a8b8c 100644
> --- a/man2/adjtimex.2
> +++ b/man2/adjtimex.2
> @@ -109,12 +109,13 @@ returns the clock state:
> .PP
> .in +4n
> .nf
> -#define TIME_OK 0 /* clock synchronized */
> -#define TIME_INS 1 /* insert leap second */
> -#define TIME_DEL 2 /* delete leap second */
> -#define TIME_OOP 3 /* leap second in progress */
> -#define TIME_WAIT 4 /* leap second has occurred */
> -#define TIME_BAD 5 /* clock not synchronized */
> +#define TIME_OK 0 /* clock synchronized */
> +#define TIME_INS 1 /* insert leap second */
> +#define TIME_DEL 2 /* delete leap second */
> +#define TIME_OOP 3 /* leap second in progress */
> +#define TIME_WAIT 4 /* leap second has occurred */
> +#define TIME_ERROR 5 /* clock not synchronized */
> +#define TIME_BAD TIME_ERROR /* bw compat */
> .fi
> .in
> .PP
Thanks for your patch. Because of other recent changes to the page,
it does not apply, but I instead applied the patch below. Does
that look okay to you?
Thanks,
Michael
diff --git a/man2/adjtimex.2 b/man2/adjtimex.2
index 4b558b7..644e39b 100644
--- a/man2/adjtimex.2
+++ b/man2/adjtimex.2
@@ -305,8 +305,13 @@ Leap second in progress.
.BR TIME_WAIT
Leap second has occurred.
.TP
-.BR TIME_BAD
+.BR TIME_ERROR
Clock not synchronized.
+The symbolic name
+.B TIME_BAD
+is a synonym for
+.BR TIME_ERROR ,
+provided for backward comaptibility.
.PP
On failure,
.BR adjtimex ()
--
Michael Kerrisk
Linux man-pages maintainer; http://www.kernel.org/doc/man-pages/
Linux/UNIX System Programming Training: http://man7.org/training/
prev parent reply other threads:[~2015-01-06 6:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-24 13:00 [PATCH 1/2] adjtimex.2: Update return value of adjtimex Masanari Iida
[not found] ` <1419426040-16090-1-git-send-email-standby24x7-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-12-24 13:00 ` [PATCH 2/2] adjtimex.2: Update modes field " Masanari Iida
2015-01-06 6:45 ` Michael Kerrisk (man-pages)
2015-01-06 6:34 ` Michael Kerrisk (man-pages) [this message]
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=54AB81DC.2000308@gmail.com \
--to=mtk.manpages@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-man@vger.kernel.org \
--cc=standby24x7@gmail.com \
/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).