Update copyright dates with scripts/update-copyrights.

[thirdparty/glibc.git] / sysdeps / unix / sysv / linux / alpha / adjtime.c

diff --git a/sysdeps/unix/sysv/linux/alpha/adjtime.c b/sysdeps/unix/sysv/linux/alpha/adjtime.c
index f8b272e9ce0417f8ef14f999a9f8d460f7363f04..65641e9c4daa185a602f828101a4cf4b9c734e0c 100644 (file)
--- a/sysdeps/unix/sysv/linux/alpha/adjtime.c
+++ b/sysdeps/unix/sysv/linux/alpha/adjtime.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1998-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -12,16 +12,15 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library.  If not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <shlib-compat.h>
 #include <sysdep.h>
 #include <sys/time.h>
-#include "kernel-features.h"
 
-#if !defined __ASSUME_TIMEVAL64 || SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
+
+#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
 struct timeval32
 {
     int tv_sec, tv_usec;
@@ -61,161 +60,35 @@ struct timex32 {
 #define ADJTIME                attribute_compat_text_section __adjtime_tv32
 #define ADJTIMEX(x)    INLINE_SYSCALL (old_adjtimex, 1, x)
 #define ADJTIMEX32(x)  INLINE_SYSCALL (old_adjtimex, 1, x)
-#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
-#define LINKAGE
-#else
-#define LINKAGE                static
-#endif
-
-LINKAGE int ADJTIME (const struct TIMEVAL *itv, struct TIMEVAL *otv);
 
 #include <sysdeps/unix/sysv/linux/adjtime.c>
 
-#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
-int
-attribute_compat_text_section
+int attribute_compat_text_section
 __adjtimex_tv32 (struct timex32 *tx) { return ADJTIMEX (tx); }
+
 strong_alias (__adjtimex_tv32, __adjtimex_tv32_1);
 strong_alias (__adjtimex_tv32, __adjtimex_tv32_2);
 compat_symbol (libc, __adjtimex_tv32_1, __adjtimex, GLIBC_2_0);
 compat_symbol (libc, __adjtimex_tv32_2, adjtimex, GLIBC_2_0);
 compat_symbol (libc, __adjtime_tv32, adjtime, GLIBC_2_0);
-#endif
-#endif /* !__ASSUME_TIMEVAL64 || SHLIB_COMPAT */
+#endif /* SHLIB_COMPAT */
 
 #undef TIMEVAL
-#define TIMEVAL                timeval
 #undef TIMEX
-#define TIMEX          timex
 #undef ADJTIME
-#define ADJTIME                __adjtime_tv64
 #undef ADJTIMEX
+#define TIMEVAL                timeval
+#define TIMEX          timex
 #define ADJTIMEX(x)    INLINE_SYSCALL (adjtimex, 1, x)
-#undef LINKAGE
-#define LINKAGE                static
-
-LINKAGE int ADJTIME (const struct TIMEVAL *itv, struct TIMEVAL *otv);
 
 #include <sysdeps/unix/sysv/linux/adjtime.c>
-#include <stdbool.h>
-
-#if !defined __ASSUME_TIMEVAL64
-static bool missing_adjtimex;
 
 int
-__adjtime (itv, otv)
-     const struct timeval *itv;
-     struct timeval *otv;
-{
-  struct timeval32 itv32, otv32;
-  int ret;
-
-  switch (missing_adjtimex)
-    {
-    case false:
-      ret = __adjtime_tv64 (itv, otv);
-      if (ret && errno == ENOSYS)
-       missing_adjtimex = 1;
-      else
-       break;
-
-      /* FALLTHRU */
-
-    default:
-      itv32.tv_sec = itv->tv_sec;
-      itv32.tv_usec = itv->tv_usec;
-      ret = __adjtime_tv32 (&itv32, &otv32);
-      if (ret == 0)
-       {
-         otv->tv_sec = otv32.tv_sec;
-         otv->tv_usec = otv32.tv_usec;
-       }
-      break;
-    }
-
-  return ret;
-}
-#else
-strong_alias (__adjtime_tv64, __adjtime);
-#endif
+__adjtimex_tv64 (struct timex *tx) { return ADJTIMEX (tx); }
 
-versioned_symbol (libc, __adjtime, adjtime, GLIBC_2_1);
-
-int
-__adjtimex_tv64 (struct timex *tx)
-{
-#if defined __ASSUME_TIMEVAL64
-  return ADJTIMEX (tx);
-#else
-  struct timex32 tx32;
-  int ret;
-
-  switch (missing_adjtimex)
-    {
-    case false:
-      ret = ADJTIMEX (tx);
-      if (ret && errno == ENOSYS)
-       missing_adjtimex = 1;
-      else
-       break;
-
-      /* FALLTHRU */
-
-    default:
-      tx32.modes = tx->modes;
-      tx32.offset = tx->offset;
-      tx32.freq = tx->freq;
-      tx32.maxerror = tx->maxerror;
-      tx32.esterror = tx->esterror;
-      tx32.status = tx->status;
-      tx32.constant = tx->constant;
-      tx32.precision = tx->precision;
-      tx32.tolerance = tx->tolerance;
-      tx32.time.tv_sec = tx->time.tv_sec;
-      tx32.time.tv_sec = tx->time.tv_usec;
-      tx32.tick = tx->tick;
-      tx32.ppsfreq = tx->ppsfreq;
-      tx32.jitter = tx->jitter;
-      tx32.shift = tx->shift;
-      tx32.stabil = tx->stabil;
-      tx32.jitcnt = tx->jitcnt;
-      tx32.calcnt = tx->calcnt;
-      tx32.errcnt = tx->errcnt;
-      tx32.stbcnt = tx->stbcnt;
-
-      ret = ADJTIMEX32 (&tx32);
-      if (ret == 0)
-       {
-         tx->modes = tx32.modes;
-         tx->offset = tx32.offset;
-         tx->freq = tx32.freq;
-         tx->maxerror = tx32.maxerror;
-         tx->esterror = tx32.esterror;
-         tx->status = tx32.status;
-         tx->constant = tx32.constant;
-         tx->precision = tx32.precision;
-         tx->tolerance = tx32.tolerance;
-         tx->time.tv_sec = tx32.time.tv_sec;
-         tx->time.tv_usec = tx32.time.tv_sec;
-         tx->tick = tx32.tick;
-         tx->ppsfreq = tx32.ppsfreq;
-         tx->jitter = tx32.jitter;
-         tx->shift = tx32.shift;
-         tx->stabil = tx32.stabil;
-         tx->jitcnt = tx32.jitcnt;
-         tx->calcnt = tx32.calcnt;
-         tx->errcnt = tx32.errcnt;
-         tx->stbcnt = tx32.stbcnt;
-       }
-      break;
-    }
-
-  return ret;
-#endif
-}
-
-strong_alias (__adjtimex_tv64, __adjtimex_internal);
+libc_hidden_ver (__adjtimex_tv64, __adjtimex)
 strong_alias (__adjtimex_tv64, __adjtimex_tv64p);
 weak_alias (__adjtimex_tv64, ntp_adjtime);
 versioned_symbol (libc, __adjtimex_tv64, __adjtimex, GLIBC_2_1);
 versioned_symbol (libc, __adjtimex_tv64p, adjtimex, GLIBC_2_1);
+versioned_symbol (libc, __adjtime, adjtime, GLIBC_2_1);