public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] y2038: alpha: Rename valid_timeval64_to_timeval to valid_timeval_to_timeval32
@ 2020-02-07 16:56 Lukasz Majewski
0 siblings, 0 replies; only message in thread
From: Lukasz Majewski @ 2020-02-07 16:56 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=ebc2368121bf1932e530ef126b5a0765953e77ad
commit ebc2368121bf1932e530ef126b5a0765953e77ad
Author: Lukasz Majewski <lukma@denx.de>
Date: Tue Jan 28 14:26:40 2020 +0100
y2038: alpha: Rename valid_timeval64_to_timeval to valid_timeval_to_timeval32
The name 'valid_timeval64_to_timeval' suggest conversion of struct
__timeval64 to struct timeval (as in ./include/time.h).
As on the alpha the struct timeval supports 64 bit time, it seems more
feasible to emphasis struct timeval32 in the conversion function name.
Hence the helper function naming change to 'valid_timeval_to_timeval32'.
Build tests:
./src/scripts/build-many-glibcs.py glibcs
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diff:
---
sysdeps/unix/sysv/linux/alpha/osf_adjtime.c | 4 ++--
sysdeps/unix/sysv/linux/alpha/osf_getitimer.c | 4 ++--
sysdeps/unix/sysv/linux/alpha/osf_setitimer.c | 4 ++--
sysdeps/unix/sysv/linux/alpha/tv32-compat.h | 6 +++---
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c b/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c
index 5ac72e2..9825a47 100644
--- a/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c
+++ b/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c
@@ -63,7 +63,7 @@ __adjtime_tv32 (const struct timeval32 *itv, struct timeval32 *otv)
if (__adjtime (&itv64, &otv64) == -1)
return -1;
- *otv = valid_timeval64_to_timeval (otv64);
+ *otv = valid_timeval_to_timeval32 (otv64);
return 0;
}
@@ -116,7 +116,7 @@ __adjtimex_tv32 (struct timex32 *tx)
tx->calcnt = tx64.calcnt;
tx->errcnt = tx64.errcnt;
tx->stbcnt = tx64.stbcnt;
- tx->time = valid_timeval64_to_timeval (tx64.time);
+ tx->time = valid_timeval_to_timeval32 (tx64.time);
return status;
}
diff --git a/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c b/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c
index 1da3d72..e9de2b2 100644
--- a/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c
+++ b/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c
@@ -33,9 +33,9 @@ __getitimer_tv32 (int which, struct itimerval32 *curr_value)
/* Write all fields of 'curr_value' regardless of overflow. */
curr_value->it_interval
- = valid_timeval64_to_timeval (curr_value_64.it_interval);
+ = valid_timeval_to_timeval32 (curr_value_64.it_interval);
curr_value->it_value
- = valid_timeval64_to_timeval (curr_value_64.it_value);
+ = valid_timeval_to_timeval32 (curr_value_64.it_value);
return 0;
}
diff --git a/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c b/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c
index 3935d1c..7df2d1b 100644
--- a/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c
+++ b/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c
@@ -43,9 +43,9 @@ __setitimer_tv32 (int which, const struct itimerval32 *restrict new_value,
/* Write all fields of 'old_value' regardless of overflow. */
old_value->it_interval
- = valid_timeval64_to_timeval (old_value_64.it_interval);
+ = valid_timeval_to_timeval32 (old_value_64.it_interval);
old_value->it_value
- = valid_timeval64_to_timeval (old_value_64.it_value);
+ = valid_timeval_to_timeval32 (old_value_64.it_value);
return 0;
}
diff --git a/sysdeps/unix/sysv/linux/alpha/tv32-compat.h b/sysdeps/unix/sysv/linux/alpha/tv32-compat.h
index 7169909..8e34ed1 100644
--- a/sysdeps/unix/sysv/linux/alpha/tv32-compat.h
+++ b/sysdeps/unix/sysv/linux/alpha/tv32-compat.h
@@ -76,7 +76,7 @@ valid_timeval32_to_timeval (const struct timeval32 tv)
}
static inline struct timeval32
-valid_timeval64_to_timeval (const struct timeval tv64)
+valid_timeval_to_timeval32 (const struct timeval tv64)
{
if (__glibc_unlikely (tv64.tv_sec > (time_t) INT32_MAX))
return (struct timeval32) { INT32_MAX, TV_USEC_MAX};
@@ -103,8 +103,8 @@ rusage64_to_rusage32 (struct rusage32 *restrict r32,
padding and reserved fields. */
memset (r32, 0, sizeof *r32);
- r32->ru_utime = valid_timeval64_to_timeval (r64->ru_utime);
- r32->ru_stime = valid_timeval64_to_timeval (r64->ru_stime);
+ r32->ru_utime = valid_timeval_to_timeval32 (r64->ru_utime);
+ r32->ru_stime = valid_timeval_to_timeval32 (r64->ru_stime);
r32->ru_maxrss = r64->ru_maxrss;
r32->ru_ixrss = r64->ru_ixrss;
r32->ru_idrss = r64->ru_idrss;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-02-07 16:56 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-07 16:56 [glibc] y2038: alpha: Rename valid_timeval64_to_timeval to valid_timeval_to_timeval32 Lukasz Majewski
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 read-only IMAP folder(s) and NNTP newsgroup(s).