From 03b579ec713d0a1062b16d0eab64d3189f6e325a Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 25 Oct 2018 12:24:30 +0200 Subject: [PATCH] tipc: Drop unused variable 'genl' Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1602555 Upstream Status: iproute2.git commit 8d05f33a381a2 commit 8d05f33a381a22572341204c667aafca02aabcca Author: Phil Sutter Date: Thu Oct 18 15:48:09 2018 +0200 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 Signed-off-by: Stephen Hemminger --- tipc/node.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tipc/node.c b/tipc/node.c index 0fa1064..2fec675 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; -- 1.8.3.1