system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-23 19:28:36 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

rename 'enum res' and 'struct status' to 'enum sm_res' and 'struct sm_status'

Browse source 
to avoid -Wshadow warnings in consumers of its generated header files.
This commit is contained in:
Alfred Perlstein 2002-03-22 19:43:21 +00:00
parent efddf1388d
commit bc0381304d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=92970
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/rpcsvc/sm_inter.x
View file

@ -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 */

6
usr.sbin/rpc.statd/procs.c
View file

@ -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);