public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Lukasz Majewski <lukma@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc] y2038: alpha: Rename valid_timeval64_to_timeval to valid_timeval_to_timeval32 Date: Fri, 07 Feb 2020 16:56:00 -0000 [thread overview] Message-ID: <20200207165649.125686.qmail@sourceware.org> (raw) 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;
reply other threads:[~2020-02-07 16:56 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20200207165649.125686.qmail@sourceware.org \ --to=lukma@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /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: linkBe 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 read-only IMAP folder(s) and NNTP newsgroup(s).