diff options
| -rw-r--r-- | nptl/ChangeLog | 6 | ||||
| -rw-r--r-- | nptl/pthread_cond_timedwait.c | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 48aa6da1ad..745accdaf7 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,9 @@ +2012-11-21 Joseph Myers <joseph@codesourcery.com> + + * pthread_cond_timedwait.c (__pthread_cond_timedwait) + [__NR_clock_gettime]: Cast result of INTERNAL_VSYSCALL to void + instead of storing in otherwise-unused variable. + 2012-11-14 Marcus Shawcroft <marcus.shawcroft@linaro.org> * Makefile (CFLAGS-open.c, CFLAGS-open64.c, CFLAGS-pause.c) diff --git a/nptl/pthread_cond_timedwait.c b/nptl/pthread_cond_timedwait.c index 2fcbc57c2a..ef33b966b8 100644 --- a/nptl/pthread_cond_timedwait.c +++ b/nptl/pthread_cond_timedwait.c @@ -115,11 +115,10 @@ __pthread_cond_timedwait (cond, mutex, abstime) { # ifdef __NR_clock_gettime INTERNAL_SYSCALL_DECL (err); - int ret; - ret = INTERNAL_VSYSCALL (clock_gettime, err, 2, - (cond->__data.__nwaiters - & ((1 << COND_NWAITERS_SHIFT) - 1)), - &rt); + (void) INTERNAL_VSYSCALL (clock_gettime, err, 2, + (cond->__data.__nwaiters + & ((1 << COND_NWAITERS_SHIFT) - 1)), + &rt); /* Convert the absolute timeout value to a relative timeout. */ rt.tv_sec = abstime->tv_sec - rt.tv_sec; rt.tv_nsec = abstime->tv_nsec - rt.tv_nsec; |