diff options
| author | F. Aragon <paco@voltanet.io> | 2018-09-12 12:55:31 +0200 |
|---|---|---|
| committer | F. Aragon <paco@voltanet.io> | 2018-09-12 12:55:31 +0200 |
| commit | dc7204b77579fc5667c330a8917eb55e1829f2c9 (patch) | |
| tree | dff4ecb5b21dccbe24a39f54389bbc2fd0802b48 /pimd/mtracebis_netlink.c | |
| parent | Merge pull request #2944 from thbtcllt/master (diff) | |
| download | frr-dc7204b77579fc5667c330a8917eb55e1829f2c9.tar.xz frr-dc7204b77579fc5667c330a8917eb55e1829f2c9.zip | |
pimd ripd ripngd: variable shadowing fixes
Signed-off-by: F. Aragon <paco@voltanet.io>
Diffstat (limited to 'pimd/mtracebis_netlink.c')
| -rw-r--r-- | pimd/mtracebis_netlink.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pimd/mtracebis_netlink.c b/pimd/mtracebis_netlink.c index 30ee8f24a..47b5f7e52 100644 --- a/pimd/mtracebis_netlink.c +++ b/pimd/mtracebis_netlink.c @@ -243,7 +243,7 @@ int rtnl_dump_filter_l(struct rtnl_handle *rth, break; /* process next filter */ } if (h->nlmsg_type == NLMSG_ERROR) { - struct nlmsgerr *err = + struct nlmsgerr *merr = (struct nlmsgerr *)NLMSG_DATA( h); if (h->nlmsg_len @@ -252,7 +252,7 @@ int rtnl_dump_filter_l(struct rtnl_handle *rth, fprintf(stderr, "ERROR truncated\n"); } else { - errno = -err->error; + errno = -merr->error; perror("RTNETLINK answers"); } return -1; @@ -379,12 +379,12 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer, } if (h->nlmsg_type == NLMSG_ERROR) { - struct nlmsgerr *err = + struct nlmsgerr *merr = (struct nlmsgerr *)NLMSG_DATA(h); if (l < (int)sizeof(struct nlmsgerr)) { fprintf(stderr, "ERROR truncated\n"); } else { - errno = -err->error; + errno = -merr->error; if (errno == 0) { if (answer) memcpy(answer, h, |