The branch main has been updated by markj:
URL:
https://cgit.FreeBSD.org/src/commit/?id=60d12ef952a39581e967a1a608522fdbdedefa01
commit 60d12ef952a39581e967a1a608522fdbdedefa01
Author: Mark Johnston <ma...@freebsd.org>
AuthorDate: 2021-03-08 17:39:06 +0000
Commit: Mark Johnston <ma...@freebsd.org>
CommitDate: 2021-03-08 17:39:06 +0000
posix timers: Sprinkle some style fixes
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
---
sys/kern/kern_time.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index 1d5bd2343153..3e85f8e1d6ec 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -1518,8 +1518,8 @@ realtimer_gettime(struct itimer *it, struct itimerspec
*ovalue)
}
static int
-realtimer_settime(struct itimer *it, int flags,
- struct itimerspec *value, struct itimerspec *ovalue)
+realtimer_settime(struct itimer *it, int flags, struct itimerspec *value,
+ struct itimerspec *ovalue)
{
struct timespec cts, ts;
struct timeval tv;
@@ -1548,7 +1548,7 @@ realtimer_settime(struct itimer *it, int flags,
if ((flags & TIMER_ABSTIME) == 0) {
/* Convert to absolute time. */
timespecadd(&it->it_time.it_value, &cts,
- &it->it_time.it_value);
+ &it->it_time.it_value);
} else {
timespecsub(&ts, &cts, &ts);
/*
@@ -1557,8 +1557,8 @@ realtimer_settime(struct itimer *it, int flags,
*/
}
TIMESPEC_TO_TIMEVAL(&tv, &ts);
- callout_reset(&it->it_callout, tvtohz(&tv),
- realtimer_expire, it);
+ callout_reset(&it->it_callout, tvtohz(&tv), realtimer_expire,
+ it);
} else {
callout_stop(&it->it_callout);
}
@@ -1618,16 +1618,16 @@ realtimer_expire(void *arg)
if (timespeccmp(&cts, &it->it_time.it_value, >=)) {
if (timespecisset(&it->it_time.it_interval)) {
timespecadd(&it->it_time.it_value,
- &it->it_time.it_interval,
- &it->it_time.it_value);
+ &it->it_time.it_interval,
+ &it->it_time.it_value);
while (timespeccmp(&cts, &it->it_time.it_value, >=)) {
if (it->it_overrun < INT_MAX)
it->it_overrun++;
else
it->it_ksi.ksi_errno = ERANGE;
timespecadd(&it->it_time.it_value,
- &it->it_time.it_interval,
- &it->it_time.it_value);
+ &it->it_time.it_interval,
+ &it->it_time.it_value);
}
} else {
/* single shot timer ? */
@@ -1637,7 +1637,7 @@ realtimer_expire(void *arg)
timespecsub(&it->it_time.it_value, &cts, &ts);
TIMESPEC_TO_TIMEVAL(&tv, &ts);
callout_reset(&it->it_callout, tvtohz(&tv),
- realtimer_expire, it);
+ realtimer_expire, it);
}
itimer_enter(it);
ITIMER_UNLOCK(it);
@@ -1649,7 +1649,7 @@ realtimer_expire(void *arg)
timespecsub(&ts, &cts, &ts);
TIMESPEC_TO_TIMEVAL(&tv, &ts);
callout_reset(&it->it_callout, tvtohz(&tv), realtimer_expire,
- it);
+ it);
}
}
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
