summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--usr.bin/rcs/ci.c4
-rw-r--r--usr.sbin/rpc.lockd/test.c6
-rw-r--r--usr.sbin/unbound/libunbound/libunbound.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/rcs/ci.c b/usr.bin/rcs/ci.c
index 1b784cb13e0..b31e16e2d9a 100644
--- a/usr.bin/rcs/ci.c
+++ b/usr.bin/rcs/ci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ci.c,v 1.221 2015/06/17 08:13:31 nicm Exp $ */
+/* $OpenBSD: ci.c,v 1.222 2015/09/05 09:38:23 jsg Exp $ */
/*
* Copyright (c) 2005, 2006 Niall O'Higgins <niallo@openbsd.org>
* All rights reserved.
@@ -731,7 +731,7 @@ checkin_attach_symbol(struct checkin_params *pb)
}
}
}
- if ((ret = rcs_sym_add(pb->file, pb->symbol, pb->newrev) == -1) &&
+ if ((ret = rcs_sym_add(pb->file, pb->symbol, pb->newrev)) == -1 &&
(rcs_errno == RCS_ERR_DUPENT)) {
rcsnum_tostr(rcs_sym_getrev(pb->file, pb->symbol),
rbuf, sizeof(rbuf));
diff --git a/usr.sbin/rpc.lockd/test.c b/usr.sbin/rpc.lockd/test.c
index 176291aba91..8a6dce685d9 100644
--- a/usr.sbin/rpc.lockd/test.c
+++ b/usr.sbin/rpc.lockd/test.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: test.c,v 1.6 2013/04/19 05:06:21 deraadt Exp $ */
+/* $OpenBSD: test.c,v 1.7 2015/09/05 09:38:23 jsg Exp $ */
#include <rpc/rpc.h>
#include <rpcsvc/nlm_prot.h>
@@ -27,8 +27,8 @@ nlm_lock_1(struct nlm_lockargs *argp, CLIENT *clnt)
static nlm_res res;
bzero((char *) &res, sizeof(res));
- if (st = clnt_call(clnt, NLM_LOCK, xdr_nlm_lockargs, argp, xdr_nlm_res,
- &res, TIMEOUT) != RPC_SUCCESS) {
+ if ((st = clnt_call(clnt, NLM_LOCK, xdr_nlm_lockargs, argp, xdr_nlm_res,
+ &res, TIMEOUT)) != RPC_SUCCESS) {
printf("clnt_call returns %d\n", st);
clnt_perror(clnt, "humbug");
return (NULL);
diff --git a/usr.sbin/unbound/libunbound/libunbound.c b/usr.sbin/unbound/libunbound/libunbound.c
index b3a4c2ba77f..23d489e2ead 100644
--- a/usr.sbin/unbound/libunbound/libunbound.c
+++ b/usr.sbin/unbound/libunbound/libunbound.c
@@ -946,7 +946,7 @@ ub_ctx_resolvconf(struct ub_ctx* ctx, const char* fname)
while (ptr) {
numserv++;
if((retval=ub_ctx_set_fwd(ctx,
- ptr->IpAddress.String)!=0)) {
+ ptr->IpAddress.String))!=0) {
free(info);
return retval;
}