[PATCH 1/2] adjtimex.2: Update return value of adjtimex

[PATCH 1/2] adjtimex.2: Update return value of adjtimex

[Masanari Iida]

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
-- 
2.2.1.62.g3f15098

[PATCH 2/2] adjtimex.2: Update modes field of adjtimex

[Masanari Iida]

This patch update modes field of adjtimex man page.

Signed-off-by: Masanari Iida <standby24x7-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 man2/adjtimex.2 | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/man2/adjtimex.2 b/man2/adjtimex.2
index f2a8b8c..b4450e8 100644
--- a/man2/adjtimex.2
+++ b/man2/adjtimex.2
@@ -92,8 +92,15 @@ combination of zero or more of the following bits:
 #define ADJ_ESTERROR          0x0008 /* estimated time error */
 #define ADJ_STATUS            0x0010 /* clock status */
 #define ADJ_TIMECONST         0x0020 /* pll time constant */
+#define ADJ_TAI               0x0080 /* set TAI offset */
+#define ADJ_SETOFFSET         0x0100 /* add 'time' to current time */
+#define ADJ_MICRO             0x1000 /* select microsecond
+                                        resolution */
+#define ADJ_NANO              0x2000 /* select nanosecond
+                                        resolution */
 #define ADJ_TICK              0x4000 /* tick value */
-#define ADJ_OFFSET_SINGLESHOT 0x8001 /* old-fashioned adjtime() */
+#define ADJ_OFFSET_SINGLESHOT 0x8001 /* old-fashioned adjtime */
+#define ADJ_OFFSET_SS_READ    0xa001 /* read-only adjtime */
 .fi
 .in
 .PP
-- 
2.2.1.62.g3f15098

--
To unsubscribe from this list: send the line "unsubscribe linux-man" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 2/2] adjtimex.2: Update modes field of adjtimex

[Michael Kerrisk (man-pages)]

On 12/24/2014 02:00 PM, Masanari Iida wrote:
> This patch update modes field of adjtimex man page.

Hello Masanari Iida,

Thanks for this patch. As it happened, some other
recent changes to the page covered the same changes
already, so this patch is obsolete. You can find the no
current version in Git (see
http://git.kernel.org/cgit/docs/man-pages/man-pages.git/tree/man2/adjtimex.2
)

Cheers,

Michael


> 
> Signed-off-by: Masanari Iida <standby24x7@gmail.com>
> ---
>  man2/adjtimex.2 | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/man2/adjtimex.2 b/man2/adjtimex.2
> index f2a8b8c..b4450e8 100644
> --- a/man2/adjtimex.2
> +++ b/man2/adjtimex.2
> @@ -92,8 +92,15 @@ combination of zero or more of the following bits:
>  #define ADJ_ESTERROR          0x0008 /* estimated time error */
>  #define ADJ_STATUS            0x0010 /* clock status */
>  #define ADJ_TIMECONST         0x0020 /* pll time constant */
> +#define ADJ_TAI               0x0080 /* set TAI offset */
> +#define ADJ_SETOFFSET         0x0100 /* add 'time' to current time */
> +#define ADJ_MICRO             0x1000 /* select microsecond
> +                                        resolution */
> +#define ADJ_NANO              0x2000 /* select nanosecond
> +                                        resolution */
>  #define ADJ_TICK              0x4000 /* tick value */
> -#define ADJ_OFFSET_SINGLESHOT 0x8001 /* old-fashioned adjtime() */
> +#define ADJ_OFFSET_SINGLESHOT 0x8001 /* old-fashioned adjtime */
> +#define ADJ_OFFSET_SS_READ    0xa001 /* read-only adjtime */
>  .fi
>  .in
>  .PP
> 


-- 
Michael Kerrisk
Linux man-pages maintainer; http://www.kernel.org/doc/man-pages/
Linux/UNIX System Programming Training: http://man7.org/training/

Re: [PATCH 1/2] adjtimex.2: Update return value of adjtimex

[Michael Kerrisk (man-pages)]

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/