>From a653b89da5ffcfe2c55588b297f05f7d673f70cb Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sat, 2 Nov 2019 00:36:26 -0400 Subject: [PATCH] compat fixup: adjtimex_time32 --- compat/time32/adjtimex_time32.c | 33 +++------------------------------ 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/compat/time32/adjtimex_time32.c b/compat/time32/adjtimex_time32.c index d7541da8..9c6f190a 100644 --- a/compat/time32/adjtimex_time32.c +++ b/compat/time32/adjtimex_time32.c @@ -1,37 +1,10 @@ #include "time32.h" #include -#include #include -#include -#include -struct oldtimex { - unsigned modes; - long offset, freq, maxerror, esterror; - int status; - long constant, precision, tolerance; - long time_sec, time_usec; - long tick, ppsfreq, jitter; - int shift; - long stabil, jitcnt, calcnt, errcnt, stbcnt; - int tai; - int __padding[11]; -}; +struct timex32; -int __adjtimex_time32(struct timex *tx32) +int __adjtimex_time32(struct timex32 *tx32) { - struct timex utx; - memcpy(&utx, tx32, sizeof(struct oldtimex)); - utx.time.tv_sec = - *(long *)((char *)tx32 + offsetof(struct oldtimex,time_sec)); - utx.time.tv_usec = - *(long *)((char *)tx32 + offsetof(struct oldtimex,time_usec)); - int r = adjtimex(&utx); - if (r<0) return r; - memcpy(tx32, &utx, sizeof(struct oldtimex)); - *(long *)((char *)tx32 + offsetof(struct oldtimex,time_sec)) = - utx.time.tv_sec; - *(long *)((char *)tx32 + offsetof(struct oldtimex,time_usec)) = - utx.time.tv_usec; - return r; + return __clock_adjtime32(CLOCK_REALTIME, tx32); } -- 2.21.0