Module Name: src
Committed By: dholland
Date: Sat Mar 12 02:01:23 UTC 2016
Modified Files:
src/usr.sbin/rpc.lockd: test.c
Log Message:
Fix operator precedence in complex conditional by separating out the
assignment part. PR 50954 from David Binderman. While here, separate
out the assignment in all the other similar conditionals too.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/rpc.lockd/test.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/rpc.lockd/test.c
diff -u src/usr.sbin/rpc.lockd/test.c:1.4 src/usr.sbin/rpc.lockd/test.c:1.5
--- src/usr.sbin/rpc.lockd/test.c:1.4 Sun Nov 4 23:12:50 2007
+++ src/usr.sbin/rpc.lockd/test.c Sat Mar 12 02:01:23 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: test.c,v 1.4 2007/11/04 23:12:50 christos Exp $ */
+/* $NetBSD: test.c,v 1.5 2016/03/12 02:01:23 dholland Exp $ */
#include <stdio.h>
#include <string.h>
@@ -11,7 +11,7 @@
static char sccsid[] = "from: @(#)nlm_prot.x 1.8 87/09/21 Copyr 1987 Sun Micro";
static char sccsid[] = "from: * @(#)nlm_prot.x 2.1 88/08/01 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: test.c,v 1.4 2007/11/04 23:12:50 christos Exp $");
+__RCSID("$NetBSD: test.c,v 1.5 2016/03/12 02:01:23 dholland Exp $");
#endif
#endif /* not lint */
@@ -21,11 +21,13 @@ static struct timeval TIMEOUT = {0, 0};
nlm_testres *
nlm_test_1(struct nlm_testargs *argp, CLIENT *clnt)
{
+ enum clnt_stat st;
static nlm_testres res;
(void)memset(&res, 0, sizeof(res));
- if (clnt_call(clnt, NLM_TEST, xdr_nlm_testargs, argp, xdr_nlm_testres,
- &res, TIMEOUT) != RPC_SUCCESS)
+ st = clnt_call(clnt, NLM_TEST, xdr_nlm_testargs, argp, xdr_nlm_testres,
+ &res, TIMEOUT);
+ if (st != RPC_SUCCESS)
return NULL;
return &res;
}
@@ -38,8 +40,9 @@ nlm_lock_1(struct nlm_lockargs *argp, CL
static nlm_res res;
(void)memset(&res, 0, sizeof(res));
- if (st = clnt_call(clnt, NLM_LOCK, xdr_nlm_lockargs, argp, xdr_nlm_res,
- &res, TIMEOUT) != RPC_SUCCESS) {
+ st = clnt_call(clnt, NLM_LOCK, xdr_nlm_lockargs, argp, xdr_nlm_res,
+ &res, TIMEOUT);
+ if (st != RPC_SUCCESS) {
printf("clnt_call returns %d\n", st);
clnt_perror(clnt, "humbug");
return NULL;
@@ -51,11 +54,13 @@ nlm_lock_1(struct nlm_lockargs *argp, CL
nlm_res *
nlm_cancel_1(struct nlm_cancargs *argp, CLIENT *clnt)
{
+ enum clnt_stat st;
static nlm_res res;
(void)memset(&res, 0, sizeof(res));
- if (clnt_call(clnt, NLM_CANCEL, xdr_nlm_cancargs, argp, xdr_nlm_res,
- &res, TIMEOUT) != RPC_SUCCESS) {
+ st = clnt_call(clnt, NLM_CANCEL, xdr_nlm_cancargs, argp, xdr_nlm_res,
+ &res, TIMEOUT);
+ if (st != RPC_SUCCESS) {
return NULL;
}
return &res;
@@ -65,11 +70,13 @@ nlm_cancel_1(struct nlm_cancargs *argp,
nlm_res *
nlm_unlock_1(struct nlm_unlockargs *argp, CLIENT *clnt)
{
+ enum clnt_stat st;
static nlm_res res;
(void)memset(&res, 0, sizeof(res));
- if (clnt_call(clnt, NLM_UNLOCK, xdr_nlm_unlockargs, argp, xdr_nlm_res,
- &res, TIMEOUT) != RPC_SUCCESS) {
+ st = clnt_call(clnt, NLM_UNLOCK, xdr_nlm_unlockargs, argp, xdr_nlm_res,
+ &res, TIMEOUT);
+ if (st != RPC_SUCCESS) {
return NULL;
}
return &res;
@@ -79,11 +86,13 @@ nlm_unlock_1(struct nlm_unlockargs *argp
nlm_res *
nlm_granted_1(struct nlm_testargs *argp, CLIENT *clnt)
{
+ enum clnt_stat st;
static nlm_res res;
(void)memset(&res, 0, sizeof(res));
- if (clnt_call(clnt, NLM_GRANTED, xdr_nlm_testargs, argp, xdr_nlm_res,
- &res, TIMEOUT) != RPC_SUCCESS) {
+ st = clnt_call(clnt, NLM_GRANTED, xdr_nlm_testargs, argp, xdr_nlm_res,
+ &res, TIMEOUT);
+ if (st != RPC_SUCCESS) {
return NULL;
}
return &res;
@@ -93,11 +102,13 @@ nlm_granted_1(struct nlm_testargs *argp,
void *
nlm_test_msg_1(struct nlm_testargs *argp, CLIENT *clnt)
{
+ enum clnt_stat st;
static char res;
(void)memset(&res, 0, sizeof(res));
- if (clnt_call(clnt, NLM_TEST_MSG, xdr_nlm_testargs, argp, xdr_void,
- &res, TIMEOUT) != RPC_SUCCESS) {
+ st = clnt_call(clnt, NLM_TEST_MSG, xdr_nlm_testargs, argp, xdr_void,
+ &res, TIMEOUT);
+ if (st != RPC_SUCCESS) {
return NULL;
}
return &res;
@@ -107,11 +118,13 @@ nlm_test_msg_1(struct nlm_testargs *argp
void *
nlm_lock_msg_1(struct nlm_lockargs *argp, CLIENT *clnt)
{
+ enum clnt_stat st;
static char res;
(void)memset(&res, 0, sizeof(res));
- if (clnt_call(clnt, NLM_LOCK_MSG, xdr_nlm_lockargs, argp, xdr_void,
- NULL, TIMEOUT) != RPC_SUCCESS) {
+ st = clnt_call(clnt, NLM_LOCK_MSG, xdr_nlm_lockargs, argp, xdr_void,
+ NULL, TIMEOUT);
+ if (st != RPC_SUCCESS) {
clnt_perror(clnt, "nlm_lock_msg_1");
return NULL;
}
@@ -122,11 +135,13 @@ nlm_lock_msg_1(struct nlm_lockargs *argp
void *
nlm_cancel_msg_1(struct nlm_cancargs *argp, CLIENT *clnt)
{
+ enum clnt_stat st;
static char res;
(void)memset(&res, 0, sizeof(res));
- if (clnt_call(clnt, NLM_CANCEL_MSG, xdr_nlm_cancargs, argp, xdr_void,
- &res, TIMEOUT) != RPC_SUCCESS) {
+ st = clnt_call(clnt, NLM_CANCEL_MSG, xdr_nlm_cancargs, argp, xdr_void,
+ &res, TIMEOUT);
+ if (st != RPC_SUCCESS) {
return NULL;
}
return &res;
@@ -136,11 +151,13 @@ nlm_cancel_msg_1(struct nlm_cancargs *ar
void *
nlm_unlock_msg_1(struct nlm_unlockargs *argp, CLIENT *clnt)
{
+ enum clnt_stat st;
static char res;
(void)memset(&res, 0, sizeof(res));
- if (clnt_call(clnt, NLM_UNLOCK_MSG, xdr_nlm_unlockargs, argp, xdr_void,
- &res, TIMEOUT) != RPC_SUCCESS) {
+ st = clnt_call(clnt, NLM_UNLOCK_MSG, xdr_nlm_unlockargs, argp, xdr_void,
+ &res, TIMEOUT);
+ if (st != RPC_SUCCESS) {
return NULL;
}
return &res;
@@ -150,11 +167,13 @@ nlm_unlock_msg_1(struct nlm_unlockargs *
void *
nlm_granted_msg_1(struct nlm_testargs *argp, CLIENT *clnt)
{
+ enum clnt_stat st;
static char res;
(void)memset(&res, 0, sizeof(res));
- if (clnt_call(clnt, NLM_GRANTED_MSG, xdr_nlm_testargs, argp, xdr_void,
- &res, TIMEOUT) != RPC_SUCCESS) {
+ st = clnt_call(clnt, NLM_GRANTED_MSG, xdr_nlm_testargs, argp, xdr_void,
+ &res, TIMEOUT);
+ if (st != RPC_SUCCESS) {
return NULL;
}
return &res;
@@ -164,11 +183,13 @@ nlm_granted_msg_1(struct nlm_testargs *a
void *
nlm_test_res_1(nlm_testres *argp, CLIENT *clnt)
{
+ enum clnt_stat st;
static char res;
(void)memset(&res, 0, sizeof(res));
- if (clnt_call(clnt, NLM_TEST_RES, xdr_nlm_testres, argp, xdr_void, &res,
- TIMEOUT) != RPC_SUCCESS) {
+ st = clnt_call(clnt, NLM_TEST_RES, xdr_nlm_testres, argp, xdr_void,
+ &res, TIMEOUT);
+ if (st != RPC_SUCCESS) {
return NULL;
}
return &res;
@@ -178,11 +199,13 @@ nlm_test_res_1(nlm_testres *argp, CLIENT
void *
nlm_lock_res_1(nlm_res *argp, CLIENT *clnt)
{
+ enum clnt_stat st;
static char res;
(void)memset(&res, 0, sizeof(res));
- if (clnt_call(clnt, NLM_LOCK_RES, xdr_nlm_res, argp, xdr_void, &res,
- TIMEOUT) != RPC_SUCCESS) {
+ st = clnt_call(clnt, NLM_LOCK_RES, xdr_nlm_res, argp, xdr_void,
+ &res, TIMEOUT);
+ if (st != RPC_SUCCESS) {
return NULL;
}
return &res;
@@ -192,11 +215,13 @@ nlm_lock_res_1(nlm_res *argp, CLIENT *cl
void *
nlm_cancel_res_1(nlm_res *argp, CLIENT *clnt)
{
+ enum clnt_stat st;
static char res;
(void)memset(&res, 0, sizeof(res));
- if (clnt_call(clnt, NLM_CANCEL_RES, xdr_nlm_res, argp, xdr_void, &res,
- TIMEOUT) != RPC_SUCCESS) {
+ st = clnt_call(clnt, NLM_CANCEL_RES, xdr_nlm_res, argp, xdr_void,
+ &res, TIMEOUT);
+ if (st != RPC_SUCCESS) {
return NULL;
}
return &res;
@@ -206,11 +231,13 @@ nlm_cancel_res_1(nlm_res *argp, CLIENT *
void *
nlm_unlock_res_1(nlm_res *argp, CLIENT *clnt)
{
+ enum clnt_stat st;
static char res;
(void)memset(&res, 0, sizeof(res));
- if (clnt_call(clnt, NLM_UNLOCK_RES, xdr_nlm_res, argp, xdr_void, &res,
- TIMEOUT) != RPC_SUCCESS) {
+ st = clnt_call(clnt, NLM_UNLOCK_RES, xdr_nlm_res, argp, xdr_void,
+ &res, TIMEOUT);
+ if (st != RPC_SUCCESS) {
return NULL;
}
return &res;
@@ -220,11 +247,13 @@ nlm_unlock_res_1(nlm_res *argp, CLIENT *
void *
nlm_granted_res_1(nlm_res *argp, CLIENT *clnt)
{
+ enum clnt_stat st;
static char res;
(void)memset(&res, 0, sizeof(res));
- if (clnt_call(clnt, NLM_GRANTED_RES, xdr_nlm_res, argp, xdr_void, &res,
- TIMEOUT) != RPC_SUCCESS) {
+ st = clnt_call(clnt, NLM_GRANTED_RES, xdr_nlm_res, argp, xdr_void,
+ &res, TIMEOUT);
+ if (st != RPC_SUCCESS) {
return NULL;
}
return &res;
@@ -234,11 +263,13 @@ nlm_granted_res_1(nlm_res *argp, CLIENT
nlm_shareres *
nlm_share_3(nlm_shareargs *argp, CLIENT *clnt)
{
+ enum clnt_stat st;
static nlm_shareres res;
(void)memset(&res, 0, sizeof(res));
- if (clnt_call(clnt, NLM_SHARE, xdr_nlm_shareargs, argp,
- xdr_nlm_shareres, &res, TIMEOUT) != RPC_SUCCESS) {
+ st = clnt_call(clnt, NLM_SHARE, xdr_nlm_shareargs, argp,
+ xdr_nlm_shareres, &res, TIMEOUT);
+ if (st != RPC_SUCCESS) {
return NULL;
}
return &res;
@@ -248,11 +279,13 @@ nlm_share_3(nlm_shareargs *argp, CLIENT
nlm_shareres *
nlm_unshare_3(nlm_shareargs *argp, CLIENT *clnt)
{
+ enum clnt_stat st;
static nlm_shareres res;
(void)memset(&res, 0, sizeof(res));
- if (clnt_call(clnt, NLM_UNSHARE, xdr_nlm_shareargs, argp,
- xdr_nlm_shareres, &res, TIMEOUT) != RPC_SUCCESS) {
+ st = clnt_call(clnt, NLM_UNSHARE, xdr_nlm_shareargs, argp,
+ xdr_nlm_shareres, &res, TIMEOUT);
+ if (st != RPC_SUCCESS) {
return NULL;
}
return &res;
@@ -262,11 +295,13 @@ nlm_unshare_3(nlm_shareargs *argp, CLIEN
nlm_res *
nlm_nm_lock_3(nlm_lockargs *argp, CLIENT *clnt)
{
+ enum clnt_stat st;
static nlm_res res;
(void)memset(&res, 0, sizeof(res));
- if (clnt_call(clnt, NLM_NM_LOCK, xdr_nlm_lockargs, argp, xdr_nlm_res,
- &res, TIMEOUT) != RPC_SUCCESS) {
+ st = clnt_call(clnt, NLM_NM_LOCK, xdr_nlm_lockargs, argp, xdr_nlm_res,
+ &res, TIMEOUT);
+ if (st != RPC_SUCCESS) {
return NULL;
}
return &res;
@@ -276,11 +311,13 @@ nlm_nm_lock_3(nlm_lockargs *argp, CLIENT
void *
nlm_free_all_3(nlm_notify *argp, CLIENT *clnt)
{
+ enum clnt_stat st;
static char res;
(void)memset(&res, 0, sizeof(res));
- if (clnt_call(clnt, NLM_FREE_ALL, xdr_nlm_notify, argp, xdr_void, &res,
- TIMEOUT) != RPC_SUCCESS) {
+ st = clnt_call(clnt, NLM_FREE_ALL, xdr_nlm_notify, argp, xdr_void,
+ &res, TIMEOUT);
+ if (st != RPC_SUCCESS) {
return NULL;
}
return &res;
