diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2012-02-17 21:34:01 +0400 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2012-02-17 21:34:01 +0400 |
commit | 2196614e3df4433c43c44eb44b75c65af021089d (patch) | |
tree | 687ca39286d2436e348708411f6fea52bef2ab1b | |
parent | 1cb1472404cb050827a8902b862815ddb3973b71 (diff) |
* timer.cc (getitimer): Don't create another local ret variable in
timer_gettime calling branch. Simplify conditional since timer_gettime
always returns 0 or -1 anyway.
-rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
-rw-r--r-- | winsup/cygwin/timer.cc | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 6bbfb4d89..37a0a4649 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,11 @@ 2012-02-17 Corinna Vinschen <corinna@vinschen.de> + * timer.cc (getitimer): Don't create another local ret variable in + timer_gettime calling branch. Simplify conditional since timer_gettime + always returns 0 or -1 anyway. + +2012-02-17 Corinna Vinschen <corinna@vinschen.de> + * ntdll.h (struct _PEB): Add EnvironmentUpdateCount member. * spawn.cc (child_info_spawn::worker): Speed up job recognition. Expand comment to explain every little detail and so we never forget. diff --git a/winsup/cygwin/timer.cc b/winsup/cygwin/timer.cc index f24ddbcbc..281d20cf3 100644 --- a/winsup/cygwin/timer.cc +++ b/winsup/cygwin/timer.cc @@ -423,10 +423,8 @@ getitimer (int which, struct itimerval *ovalue) else { struct itimerspec spec_ovalue; - int ret = timer_gettime ((timer_t) &ttstart, &spec_ovalue); - if (ret) - ret = -1; - else + ret = timer_gettime ((timer_t) &ttstart, &spec_ovalue); + if (!ret) { ovalue->it_interval.tv_sec = spec_ovalue.it_interval.tv_sec; ovalue->it_interval.tv_usec = spec_ovalue.it_interval.tv_nsec / 1000; |