diff options
author | Austin Foxley <austinf@cetoncorp.com> | 2010-02-05 11:10:14 -0800 |
---|---|---|
committer | Austin Foxley <austinf@cetoncorp.com> | 2010-02-05 11:10:32 -0800 |
commit | f7eba78a7464c7b31326abf92dab254608835028 (patch) | |
tree | 5558a9e8d2c7c4484387030427701d81bd8b83e5 /libc/sysdeps/linux/common/time.c | |
parent | 3e808a4c28f214314e8457672fae0f5d17f5450a (diff) | |
parent | df1580676a48dc3a9faf7e508ad3ec822a8e5a05 (diff) |
Merge commit 'origin/master' into nptl
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'libc/sysdeps/linux/common/time.c')
-rw-r--r-- | libc/sysdeps/linux/common/time.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libc/sysdeps/linux/common/time.c b/libc/sysdeps/linux/common/time.c index 0d9e412bf..e13b44f4d 100644 --- a/libc/sysdeps/linux/common/time.c +++ b/libc/sysdeps/linux/common/time.c @@ -13,19 +13,18 @@ #ifdef __NR_time -_syscall1(time_t, time, time_t *, t) +_syscall_noerr1(time_t, time, time_t *, t) #else - time_t time(time_t * t) { time_t result; struct timeval tv; - if (gettimeofday(&tv, (struct timezone *) NULL)) { - result = (time_t) - 1; - } else { - result = (time_t) tv.tv_sec; - } + /* In Linux, gettimeofday fails only on bad parameter. + * We know that here parameter isn't bad. + */ + gettimeofday(&tv, NULL); + result = (time_t) tv.tv_sec; if (t != NULL) { *t = result; } |