diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2016-04-12 17:00:13 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2016-04-12 17:00:13 +0000 |
| commit | a123f26e9290a4636e3a8d7ac10dbd000fc50f59 (patch) | |
| tree | c3cdd1c8ee2d4ab6be944ececea30f9adb0abca4 /lib | |
| parent | 14cda706cbb8ce85acd6c6c142d92865e098fe53 (diff) | |
| parent | e321146fc5f5ebfc0fb2e5482d89297dfebb3d32 (diff) | |
Notes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/net/getservent.c | 14 | ||||
| -rw-r--r-- | lib/libc/rpc/clnt_bcast.c | 2 | ||||
| -rw-r--r-- | lib/libc/rpc/clnt_generic.c | 2 | ||||
| -rw-r--r-- | lib/libthr/thread/thr_mutex.c | 3 | ||||
| -rw-r--r-- | lib/msun/tests/Makefile | 6 |
5 files changed, 14 insertions, 13 deletions
diff --git a/lib/libc/net/getservent.c b/lib/libc/net/getservent.c index 45a5355245bb..d373dd3364a6 100644 --- a/lib/libc/net/getservent.c +++ b/lib/libc/net/getservent.c @@ -321,7 +321,7 @@ files_servent(void *retval, void *mdata, va_list ap) break; default: return NS_NOTFOUND; - }; + } serv = va_arg(ap, struct servent *); buffer = va_arg(ap, char *); @@ -463,7 +463,7 @@ files_setservent(void *retval, void *mdata, va_list ap) break; default: break; - }; + } st->compat_mode_active = 0; return (NS_UNAVAIL); @@ -522,7 +522,7 @@ db_servent(void *retval, void *mdata, va_list ap) break; default: return NS_NOTFOUND; - }; + } serv = va_arg(ap, struct servent *); buffer = va_arg(ap, char *); @@ -641,7 +641,7 @@ db_setservent(void *retval, void *mdata, va_list ap) break; default: break; - }; + } return (NS_UNAVAIL); } @@ -694,7 +694,7 @@ nis_servent(void *retval, void *mdata, va_list ap) break; default: return NS_NOTFOUND; - }; + } serv = va_arg(ap, struct servent *); buffer = va_arg(ap, char *); @@ -781,7 +781,7 @@ nis_servent(void *retval, void *mdata, va_list ap) } } break; - }; + } rv = parse_result(serv, buffer, bufsize, resultbuf, resultbuflen, errnop); @@ -815,7 +815,7 @@ nis_setservent(void *result, void *mdata, va_list ap) break; default: break; - }; + } return (NS_UNAVAIL); } diff --git a/lib/libc/rpc/clnt_bcast.c b/lib/libc/rpc/clnt_bcast.c index a194ba6c77cc..99f54082d002 100644 --- a/lib/libc/rpc/clnt_bcast.c +++ b/lib/libc/rpc/clnt_bcast.c @@ -469,7 +469,7 @@ rpc_broadcast_exp(rpcprog_t prog, rpcvers_t vers, rpcproc_t proc, "broadcast packet"); stat = RPC_CANTSEND; continue; - }; + } #ifdef RPC_DEBUG if (!__rpc_lowvers) fprintf(stderr, "Broadcast packet sent " diff --git a/lib/libc/rpc/clnt_generic.c b/lib/libc/rpc/clnt_generic.c index 0c8a425750a4..0dea81d52eb5 100644 --- a/lib/libc/rpc/clnt_generic.c +++ b/lib/libc/rpc/clnt_generic.c @@ -402,7 +402,7 @@ clnt_tli_create(int fd, const struct netconfig *nconf, if (madefd) { (void) CLNT_CONTROL(cl, CLSET_FD_CLOSE, NULL); /* (void) CLNT_CONTROL(cl, CLSET_POP_TIMOD, NULL); */ - }; + } return (cl); diff --git a/lib/libthr/thread/thr_mutex.c b/lib/libthr/thread/thr_mutex.c index 28fd9eea56f7..f75ea6f72f5c 100644 --- a/lib/libthr/thread/thr_mutex.c +++ b/lib/libthr/thread/thr_mutex.c @@ -476,7 +476,8 @@ check_and_init_mutex(pthread_mutex_t *mutex, struct pthread_mutex **m) *m = __thr_pshared_offpage(mutex, 0); if (*m == NULL) ret = EINVAL; - shared_mutex_init(*m, NULL); + else + shared_mutex_init(*m, NULL); } else if (__predict_false(*m <= THR_MUTEX_DESTROYED)) { if (*m == THR_MUTEX_DESTROYED) { ret = EINVAL; diff --git a/lib/msun/tests/Makefile b/lib/msun/tests/Makefile index 92ebc0b2eba2..8bd4d93aaa65 100644 --- a/lib/msun/tests/Makefile +++ b/lib/msun/tests/Makefile @@ -65,9 +65,9 @@ TAP_TESTS_C+= next_test TAP_TESTS_C+= rem_test TAP_TESTS_C+= trig_test -.for t in ${TAP_TESTS_C} -CFLAGS.$t+= -O0 -.endfor +.if !empty(PROG) && !empty(TAP_TESTS_C:M${PROG}) +CFLAGS+= -O0 +.endif CSTD= c99 |