Module Name: src
Committed By: nia
Date: Thu Mar 18 11:53:16 UTC 2021
Modified Files:
src/sys/kern: subr_time.c
Log Message:
ts2timo(9): refactor for clarity
- 'flags' is not a boolean...
- actually, it is, but it should simply be named "absolute".
- convert tests for if (flags) to if (flags != TIMER_RELTIME)
- hoist function calls out of if expressions (requested by uwe)
still needs fixing:
- need to check for overflow before timespecsub.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/kern/subr_time.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_time.c
diff -u src/sys/kern/subr_time.c:1.25 src/sys/kern/subr_time.c:1.26
--- src/sys/kern/subr_time.c:1.25 Sat May 23 23:42:43 2020
+++ src/sys/kern/subr_time.c Thu Mar 18 11:53:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_time.c,v 1.25 2020/05/23 23:42:43 ad Exp $ */
+/* $NetBSD: subr_time.c,v 1.26 2021/03/18 11:53:16 nia Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_time.c,v 1.25 2020/05/23 23:42:43 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_time.c,v 1.26 2021/03/18 11:53:16 nia Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -332,18 +332,20 @@ ts2timo(clockid_t clock_id, int flags, s
if (ts->tv_nsec < 0 || ts->tv_nsec >= 1000000000L)
return EINVAL;
- flags &= TIMER_ABSTIME;
if (start == NULL)
start = &tsd;
- if (flags || start != &tsd)
- if ((error = clock_gettime1(clock_id, start)) != 0)
+ if (flags != TIMER_RELTIME || start != &tsd) {
+ error = clock_gettime1(clock_id, start);
+ if (error != 0)
return error;
+ }
- if (flags)
+ if (flags != TIMER_RELTIME)
timespecsub(ts, start, ts);
- if ((error = itimespecfix(ts)) != 0)
+ error = itimespecfix(ts);
+ if (error != 0)
return error;
if (ts->tv_sec == 0 && ts->tv_nsec == 0)
