diff options
| author | Phil Sutter <phil@nwl.cc> | 2018-10-18 15:48:09 +0200 |
|---|---|---|
| committer | Stephen Hemminger <stephen@networkplumber.org> | 2018-10-22 10:05:43 -0700 |
| commit | 8d05f33a381a22572341204c667aafca02aabcca (patch) | |
| tree | 28521f9d0ca1184922fba2773f4e814ea33b3d91 /tipc | |
| parent | 3b5c5ef0a75a9f685e78cd25da78706b5077bd83 (diff) | |
tipc: Drop unused variable 'genl'
Although initialized by call to libmnl, the variable is used only in a
call to sizeof(). Drop it and call sizeof with its type instead.
Fixes: f043759dd4928 ("tipc: add new TIPC configuration tool")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Diffstat (limited to 'tipc')
| -rw-r--r-- | tipc/node.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tipc/node.c b/tipc/node.c index 0fa1064c..2fec6753 100644 --- a/tipc/node.c +++ b/tipc/node.c @@ -26,13 +26,12 @@ static int node_list_cb(const struct nlmsghdr *nlh, void *data) { - struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh); struct nlattr *info[TIPC_NLA_MAX + 1] = {}; struct nlattr *attrs[TIPC_NLA_NODE_MAX + 1] = {}; char str[33] = {}; uint32_t addr; - mnl_attr_parse(nlh, sizeof(*genl), parse_attrs, info); + mnl_attr_parse(nlh, sizeof(struct genlmsghdr), parse_attrs, info); if (!info[TIPC_NLA_NODE]) return MNL_CB_ERROR; @@ -160,7 +159,6 @@ static int cmd_node_set_nodeid(struct nlmsghdr *nlh, const struct cmd *cmd, static int nodeid_get_cb(const struct nlmsghdr *nlh, void *data) { - struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh); struct nlattr *info[TIPC_NLA_MAX + 1] = {}; struct nlattr *attrs[TIPC_NLA_NET_MAX + 1] = {}; char str[33] = {0,}; @@ -168,7 +166,7 @@ static int nodeid_get_cb(const struct nlmsghdr *nlh, void *data) uint64_t *w0 = (uint64_t *) &id[0]; uint64_t *w1 = (uint64_t *) &id[8]; - mnl_attr_parse(nlh, sizeof(*genl), parse_attrs, info); + mnl_attr_parse(nlh, sizeof(struct genlmsghdr), parse_attrs, info); if (!info[TIPC_NLA_NET]) return MNL_CB_ERROR; @@ -207,11 +205,10 @@ static int cmd_node_get_nodeid(struct nlmsghdr *nlh, const struct cmd *cmd, static int netid_get_cb(const struct nlmsghdr *nlh, void *data) { - struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh); struct nlattr *info[TIPC_NLA_MAX + 1] = {}; struct nlattr *attrs[TIPC_NLA_NET_MAX + 1] = {}; - mnl_attr_parse(nlh, sizeof(*genl), parse_attrs, info); + mnl_attr_parse(nlh, sizeof(struct genlmsghdr), parse_attrs, info); if (!info[TIPC_NLA_NET]) return MNL_CB_ERROR; |