diff options
author | alfred <alfred@FreeBSD.org> | 2002-03-22 19:43:21 +0000 |
---|---|---|
committer | alfred <alfred@FreeBSD.org> | 2002-03-22 19:43:21 +0000 |
commit | a36618aaa6b23db1e9e6102931f235c5f273a75f (patch) | |
tree | 8803f2fd8231186899acbc88b50fe99ff7429c52 | |
parent | 255cf1e087f681af027ffb2a79f4d5fcfc1e2ae2 (diff) | |
download | FreeBSD-src-a36618aaa6b23db1e9e6102931f235c5f273a75f.zip FreeBSD-src-a36618aaa6b23db1e9e6102931f235c5f273a75f.tar.gz |
rename 'enum res' and 'struct status' to 'enum sm_res' and 'struct sm_status'
to avoid -Wshadow warnings in consumers of its generated header files.
-rw-r--r-- | include/rpcsvc/sm_inter.x | 6 | ||||
-rw-r--r-- | usr.sbin/rpc.statd/procs.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/rpcsvc/sm_inter.x b/include/rpcsvc/sm_inter.x index 6e1862b..4ca2ded 100644 --- a/include/rpcsvc/sm_inter.x +++ b/include/rpcsvc/sm_inter.x @@ -106,13 +106,13 @@ struct sm_stat { int state; /* state # of status monitor */ }; -enum res { +enum sm_res { stat_succ = 0, /* status monitor agrees to monitor */ stat_fail = 1 /* status monitor cannot monitor */ }; struct sm_stat_res { - res res_stat; + sm_res res_stat; int state; }; @@ -120,7 +120,7 @@ struct sm_stat_res { * structure of the status message sent back by the status monitor * when monitor site status changes */ -struct status { +struct sm_status { string mon_name<SM_MAXSTRLEN>; int state; opaque priv[16]; /* stored private information */ diff --git a/usr.sbin/rpc.statd/procs.c b/usr.sbin/rpc.statd/procs.c index 3f27e582..b508f33 100644 --- a/usr.sbin/rpc.statd/procs.c +++ b/usr.sbin/rpc.statd/procs.c @@ -301,7 +301,7 @@ void *sm_notify_1_svc(stat_chge *arg, struct svc_req *req) struct timeval timeout = { 20, 0 }; /* 20 secs timeout */ CLIENT *cli; static char dummy; - status tx_arg; /* arg sent to callback procedure */ + sm_status tx_arg; /* arg sent to callback procedure */ MonList *lp; HostInfo *hp; pid_t pid; @@ -340,8 +340,8 @@ void *sm_notify_1_svc(stat_chge *arg, struct svc_req *req) } else { - if (clnt_call(cli, lp->notifyProc, xdr_status, &tx_arg, xdr_void, &dummy, - timeout) != RPC_SUCCESS) + if (clnt_call(cli, lp->notifyProc, xdr_sm_status, &tx_arg, xdr_void, + &dummy, timeout) != RPC_SUCCESS) { syslog(LOG_ERR, "Failed to call rpc.statd client at host %s", lp->notifyHost); |