Author: kib
Date: Tue Sep 8 08:48:53 2015
New Revision: 287557
URL: https://svnweb.freebsd.org/changeset/base/287557
Log:
Style. Use ANSI definition, wrap long lines, no initialization in
declaration for locals.
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
Modified:
head/lib/libthr/thread/thr_once.c
Modified: head/lib/libthr/thread/thr_once.c
==============================================================================
--- head/lib/libthr/thread/thr_once.c Tue Sep 8 08:41:07 2015
(r287556)
+++ head/lib/libthr/thread/thr_once.c Tue Sep 8 08:48:53 2015
(r287557)
@@ -50,9 +50,11 @@ __weak_reference(_pthread_once, pthread_
static void
once_cancel_handler(void *arg)
{
- pthread_once_t *once_control = arg;
+ pthread_once_t *once_control;
- if (atomic_cmpset_rel_int(&once_control->state, ONCE_IN_PROGRESS,
ONCE_NEVER_DONE))
+ once_control = arg;
+ if (atomic_cmpset_rel_int(&once_control->state, ONCE_IN_PROGRESS,
+ ONCE_NEVER_DONE))
return;
atomic_store_rel_int(&once_control->state, ONCE_NEVER_DONE);
_thr_umtx_wake(&once_control->state, INT_MAX, 0);
@@ -73,13 +75,17 @@ _pthread_once(pthread_once_t *once_contr
return (0);
}
if (state == ONCE_NEVER_DONE) {
- if (atomic_cmpset_int(&once_control->state, state,
ONCE_IN_PROGRESS))
+ if (atomic_cmpset_int(&once_control->state, state,
+ ONCE_IN_PROGRESS))
break;
} else if (state == ONCE_IN_PROGRESS) {
- if (atomic_cmpset_int(&once_control->state, state,
ONCE_WAIT))
- _thr_umtx_wait_uint(&once_control->state,
ONCE_WAIT, NULL, 0);
+ if (atomic_cmpset_int(&once_control->state, state,
+ ONCE_WAIT))
+ _thr_umtx_wait_uint(&once_control->state,
+ ONCE_WAIT, NULL, 0);
} else if (state == ONCE_WAIT) {
- _thr_umtx_wait_uint(&once_control->state, state, NULL,
0);
+ _thr_umtx_wait_uint(&once_control->state, state,
+ NULL, 0);
} else
return (EINVAL);
}
@@ -88,7 +94,8 @@ _pthread_once(pthread_once_t *once_contr
THR_CLEANUP_PUSH(curthread, once_cancel_handler, once_control);
init_routine();
THR_CLEANUP_POP(curthread, 0);
- if (atomic_cmpset_rel_int(&once_control->state, ONCE_IN_PROGRESS,
ONCE_DONE))
+ if (atomic_cmpset_rel_int(&once_control->state, ONCE_IN_PROGRESS,
+ ONCE_DONE))
return (0);
atomic_store_rel_int(&once_control->state, ONCE_DONE);
_thr_umtx_wake(&once_control->state, INT_MAX, 0);
@@ -96,6 +103,6 @@ _pthread_once(pthread_once_t *once_contr
}
void
-_thr_once_init()
+_thr_once_init(void)
{
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
