summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2017-06-23 19:04:40 +0000
committerkib <kib@FreeBSD.org>2017-06-23 19:04:40 +0000
commit06c09169a4b5c851d6739cb27124ac1f00ba4ed0 (patch)
treeb251d33387341cc779de6dac6c176d84e9b54a9d
parent1cea712bbd4e2cef8de50426e3c798a65916eddf (diff)
downloadFreeBSD-src-06c09169a4b5c851d6739cb27124ac1f00ba4ed0.zip
FreeBSD-src-06c09169a4b5c851d6739cb27124ac1f00ba4ed0.tar.gz
MFC r320038:
Style.
-rw-r--r--sys/kern/kern_event.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index b0f9287..52d4000 100644
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -553,12 +553,13 @@ knote_fork(struct knlist *list, int pid)
* interval timer support code.
*/
-#define NOTE_TIMER_PRECMASK (NOTE_SECONDS|NOTE_MSECONDS|NOTE_USECONDS| \
- NOTE_NSECONDS)
+#define NOTE_TIMER_PRECMASK \
+ (NOTE_SECONDS | NOTE_MSECONDS | NOTE_USECONDS | NOTE_NSECONDS)
static sbintime_t
timer2sbintime(intptr_t data, int flags)
{
+ int64_t secs;
/*
* Macros for converting to the fractional second portion of an
@@ -577,27 +578,27 @@ timer2sbintime(intptr_t data, int flags)
case NOTE_MSECONDS: /* FALLTHROUGH */
case 0:
if (data >= 1000) {
- int64_t secs = data / 1000;
+ secs = data / 1000;
#ifdef __LP64__
if (secs > (SBT_MAX / SBT_1S))
return (SBT_MAX);
#endif
return (secs << 32 | MS_TO_SBT(data % 1000));
}
- return MS_TO_SBT(data);
+ return (MS_TO_SBT(data));
case NOTE_USECONDS:
if (data >= 1000000) {
- int64_t secs = data / 1000000;
+ secs = data / 1000000;
#ifdef __LP64__
if (secs > (SBT_MAX / SBT_1S))
return (SBT_MAX);
#endif
return (secs << 32 | US_TO_SBT(data % 1000000));
}
- return US_TO_SBT(data);
+ return (US_TO_SBT(data));
case NOTE_NSECONDS:
if (data >= 1000000000) {
- int64_t secs = data / 1000000000;
+ secs = data / 1000000000;
#ifdef __LP64__
if (secs > (SBT_MAX / SBT_1S))
return (SBT_MAX);
OpenPOWER on IntegriCloud