diff options
| author | Wolfgang Hommel <wolfcw@users.noreply.github.com> | 2022-07-25 20:32:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-25 20:32:02 +0200 |
| commit | f4bf28356c106c09362c4ae2bb9e745e53f65f0b (patch) | |
| tree | 4176b35e652984b5397afafd6cac182b8e824e16 | |
| parent | be4e373e634ee58805b383558c1a56fb8088d0ec (diff) | |
| parent | 326c20ebb5352a1ca1552eea772380447685961e (diff) | |
| download | libfaketime-f4bf28356c106c09362c4ae2bb9e745e53f65f0b.tar.gz | |
Merge pull request #397 from j-xella/sun_compiler
Refactor to get rid of some non-standard gcc extensions
| -rw-r--r-- | src/libfaketime.c | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/src/libfaketime.c b/src/libfaketime.c index 9d3bc06..c847163 100644 --- a/src/libfaketime.c +++ b/src/libfaketime.c @@ -689,7 +689,8 @@ static void next_time(struct timespec *tp, struct timespec *ticklen) { if (errno == EINTR) { - return next_time(tp, ticklen); + next_time(tp, ticklen); + return; } else { @@ -752,7 +753,8 @@ static void save_time(struct timespec *tp) { if (errno == EINTR) { - return save_time(tp); + save_time(tp); + return; } else { @@ -877,7 +879,8 @@ void lock_for_stat() { if (errno == EINTR) { - return lock_for_stat(); + lock_for_stat(); + return; } else { @@ -2054,7 +2057,9 @@ int timer_settime_22(int timerid, int flags, } else { - return (timer_settime_common((timer_t_or_int)timerid, flags, new_value, old_value, + timer_t_or_int temp; + temp.int_member = timerid; + return (timer_settime_common(temp, flags, new_value, old_value, FT_COMPAT_GLIBC_2_2, TIMER_ABSTIME)); } } @@ -2076,7 +2081,9 @@ int timer_settime_233(timer_t timerid, int flags, } else { - return (timer_settime_common((timer_t_or_int)timerid, flags, new_value, old_value, + timer_t_or_int temp; + temp.timer_t_member = timerid; + return (timer_settime_common(temp, flags, new_value, old_value, FT_COMPAT_GLIBC_2_3_3, TIMER_ABSTIME)); } } @@ -2147,7 +2154,9 @@ int timer_gettime_22(timer_t timerid, struct itimerspec *curr_value) } else { - return (timer_gettime_common((timer_t_or_int)timerid, curr_value, + timer_t_or_int temp; + temp.timer_t_member = timerid; + return (timer_gettime_common(temp, curr_value, FT_COMPAT_GLIBC_2_2)); } } @@ -2167,7 +2176,9 @@ int timer_gettime_233(timer_t timerid, struct itimerspec *curr_value) } else { - return (timer_gettime_common((timer_t_or_int)timerid, curr_value, + timer_t_or_int temp; + temp.timer_t_member = timerid; + return (timer_gettime_common(temp, curr_value, FT_COMPAT_GLIBC_2_3_3)); } } @@ -2195,7 +2206,9 @@ int timerfd_settime(int fd, int flags, } else { - return (timer_settime_common((timer_t_or_int)fd, flags, new_value, old_value, FT_FD, + timer_t_or_int temp; + temp.int_member = fd; + return (timer_settime_common(temp, flags, new_value, old_value, FT_FD, TFD_TIMER_ABSTIME)); } } @@ -2215,7 +2228,9 @@ int timerfd_gettime(int fd, struct itimerspec *curr_value) } else { - return (timer_gettime_common((timer_t_or_int)fd, curr_value, FT_FD)); + timer_t_or_int temp; + temp.int_member = fd; + return (timer_gettime_common(temp, curr_value, FT_FD)); } } #endif |