matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tc: m_action: Improve conversion to C99 style initializers 

This improves my initial change in the following points:

- Flatten embedded struct's initializers.
- No need to initialize variables to zero as the key feature of C99
  initializers is to do this implicitly.
- By relocating the declaration of struct rtattr *tail, it can be
  initialized at the same time.

Fixes: a0a73b298a ("tc: m_action: Use C99 style initializers for struct req")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: David Ahern <dsa@cumulusnetworks.com>
This commit is contained in:
Phil Sutter 2016-07-18 16:48:41 +02:00 committed by Stephen Hemminger
parent 52a5986980
commit d892aaf740
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tc/m_action.c
View File

@ -395,13 +395,10 @@ static int tc_action_gd(int cmd, unsigned int flags, int *argc_p, char ***argv_p
struct tcamsg t; struct tcamsg t;
char buf[MAX_MSG]; char buf[MAX_MSG];
} req = { } req = {
.n = { .n.nlmsg_len = NLMSG_LENGTH(sizeof(struct tcamsg)),
.nlmsg_len = NLMSG_LENGTH(sizeof(struct tcamsg)), .n.nlmsg_flags = NLM_F_REQUEST | flags,
.nlmsg_flags = NLM_F_REQUEST | flags, .n.nlmsg_type = cmd,
.nlmsg_type = cmd,
},
.t.tca_family = AF_UNSPEC, .t.tca_family = AF_UNSPEC,
.buf = { 0 }
}; };
argc -= 1; argc -= 1;
@ -491,23 +488,18 @@ static int tc_action_modify(int cmd, unsigned int flags, int *argc_p, char ***ar
int argc = *argc_p; int argc = *argc_p;
char **argv = *argv_p; char **argv = *argv_p;
int ret = 0; int ret = 0;
struct rtattr *tail;
struct { struct {
struct nlmsghdr n; struct nlmsghdr n;
struct tcamsg t; struct tcamsg t;
char buf[MAX_MSG]; char buf[MAX_MSG];
} req = { } req = {
.n = { .n.nlmsg_len = NLMSG_LENGTH(sizeof(struct tcamsg)),
.nlmsg_len = NLMSG_LENGTH(sizeof(struct tcamsg)), .n.nlmsg_flags = NLM_F_REQUEST | flags,
.nlmsg_flags = NLM_F_REQUEST | flags, .n.nlmsg_type = cmd,
.nlmsg_type = cmd,
},
.t.tca_family = AF_UNSPEC, .t.tca_family = AF_UNSPEC,
.buf = { 0 }
}; };
struct rtattr *tail = NLMSG_TAIL(&req.n);
tail = NLMSG_TAIL(&req.n);
argc -= 1; argc -= 1;
argv += 1; argv += 1;
if (parse_action(&argc, &argv, TCA_ACT_TAB, &req.n)) { if (parse_action(&argc, &argv, TCA_ACT_TAB, &req.n)) {
@ -540,7 +532,6 @@ static int tc_act_list_or_flush(int argc, char **argv, int event)
} req = { } req = {
.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct tcamsg)), .n.nlmsg_len = NLMSG_LENGTH(sizeof(struct tcamsg)),
.t.tca_family = AF_UNSPEC, .t.tca_family = AF_UNSPEC,
.buf = { 0 }
}; };
tail = NLMSG_TAIL(&req.n); tail = NLMSG_TAIL(&req.n);