lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-07 06:43:00 +03:00
Code Activity

y2038: alpha: Rename valid_timeval64_to_timeval to valid_timeval_to_timeval32

Browse Source 
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>
This commit is contained in:
Lukasz Majewski
2020-01-28 14:26:40 +01:00
parent cde52c2557
commit ebc2368121
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sysdeps/unix/sysv/linux/alpha/osf_adjtime.c
View File

@@ -63,7 +63,7 @@ __adjtime_tv32 (const struct timeval32 *itv, struct timeval32 *otv)
if (__adjtime (&itv64, &otv64) == -1) if (__adjtime (&itv64, &otv64) == -1)
return -1; return -1;
*otv = valid_timeval64_to_timeval (otv64); *otv = valid_timeval_to_timeval32 (otv64);
return 0; return 0;
} }
@@ -116,7 +116,7 @@ __adjtimex_tv32 (struct timex32 *tx)
tx->calcnt = tx64.calcnt; tx->calcnt = tx64.calcnt;
tx->errcnt = tx64.errcnt; tx->errcnt = tx64.errcnt;
tx->stbcnt = tx64.stbcnt; tx->stbcnt = tx64.stbcnt;
tx->time = valid_timeval64_to_timeval (tx64.time); tx->time = valid_timeval_to_timeval32 (tx64.time);
return status; return status;
} }

4
sysdeps/unix/sysv/linux/alpha/osf_getitimer.c
View File

@@ -33,9 +33,9 @@ __getitimer_tv32 (int which, struct itimerval32 *curr_value)
/* Write all fields of 'curr_value' regardless of overflow. */ /* Write all fields of 'curr_value' regardless of overflow. */
curr_value->it_interval 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 curr_value->it_value
= valid_timeval64_to_timeval (curr_value_64.it_value); = valid_timeval_to_timeval32 (curr_value_64.it_value);
return 0; return 0;
} }

4
sysdeps/unix/sysv/linux/alpha/osf_setitimer.c
View File

@@ -43,9 +43,9 @@ __setitimer_tv32 (int which, const struct itimerval32 *restrict new_value,
/* Write all fields of 'old_value' regardless of overflow. */ /* Write all fields of 'old_value' regardless of overflow. */
old_value->it_interval 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 old_value->it_value
= valid_timeval64_to_timeval (old_value_64.it_value); = valid_timeval_to_timeval32 (old_value_64.it_value);
return 0; return 0;
} }

6
sysdeps/unix/sysv/linux/alpha/tv32-compat.h
View File

@@ -76,7 +76,7 @@ valid_timeval32_to_timeval (const struct timeval32 tv)
} }
static inline struct timeval32 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)) if (__glibc_unlikely (tv64.tv_sec > (time_t) INT32_MAX))
return (struct timeval32) { INT32_MAX, TV_USEC_MAX}; return (struct timeval32) { INT32_MAX, TV_USEC_MAX};
@@ -103,8 +103,8 @@ rusage64_to_rusage32 (struct rusage32 *restrict r32,
padding and reserved fields. */ padding and reserved fields. */
memset (r32, 0, sizeof *r32); memset (r32, 0, sizeof *r32);
r32->ru_utime = valid_timeval64_to_timeval (r64->ru_utime); r32->ru_utime = valid_timeval_to_timeval32 (r64->ru_utime);
r32->ru_stime = valid_timeval64_to_timeval (r64->ru_stime); r32->ru_stime = valid_timeval_to_timeval32 (r64->ru_stime);
r32->ru_maxrss = r64->ru_maxrss; r32->ru_maxrss = r64->ru_maxrss;
r32->ru_ixrss = r64->ru_ixrss; r32->ru_ixrss = r64->ru_ixrss;
r32->ru_idrss = r64->ru_idrss; r32->ru_idrss = r64->ru_idrss;