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

ip link: use addattr_nest()/addattr_nest_end() 

Use addattr_nest() and addattr_nest_end() to simplify the code.

Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com>
This commit is contained in:
Duan Jiong 2014-12-17 15:28:45 +08:00 committed by Stephen Hemminger
parent 5c2c10b17e
commit a1e2e5fcee
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ip/iplink.c
View File

@ -706,11 +706,11 @@ static int iplink_modify(int cmd, unsigned int flags, int argc, char **argv)
} }
if (type) { if (type) {
struct rtattr *linkinfo = NLMSG_TAIL(&req.n); struct rtattr *linkinfo;
char slavebuf[128], *ulinep = strchr(type, '_'); char slavebuf[128], *ulinep = strchr(type, '_');
int iflatype; int iflatype;
addattr_l(&req.n, sizeof(req), IFLA_LINKINFO, NULL, 0); linkinfo = addattr_nest(&req.n, sizeof(req), IFLA_LINKINFO);
addattr_l(&req.n, sizeof(req), IFLA_INFO_KIND, type, addattr_l(&req.n, sizeof(req), IFLA_INFO_KIND, type,
strlen(type)); strlen(type));
@ -728,14 +728,13 @@ static int iplink_modify(int cmd, unsigned int flags, int argc, char **argv)
iflatype = IFLA_INFO_DATA; iflatype = IFLA_INFO_DATA;
} }
if (lu && argc) { if (lu && argc) {
struct rtattr * data = NLMSG_TAIL(&req.n); struct rtattr *data = addattr_nest(&req.n, sizeof(req), iflatype);
addattr_l(&req.n, sizeof(req), iflatype, NULL, 0);
if (lu->parse_opt && if (lu->parse_opt &&
lu->parse_opt(lu, argc, argv, &req.n)) lu->parse_opt(lu, argc, argv, &req.n))
return -1; return -1;
data->rta_len = (void *)NLMSG_TAIL(&req.n) - (void *)data; addattr_nest_end(&req.n, data);
} else if (argc) { } else if (argc) {
if (matches(*argv, "help") == 0) if (matches(*argv, "help") == 0)
usage(); usage();
@ -743,7 +742,7 @@ static int iplink_modify(int cmd, unsigned int flags, int argc, char **argv)
"Try \"ip link help\".\n", *argv); "Try \"ip link help\".\n", *argv);
return -1; return -1;
} }
linkinfo->rta_len = (void *)NLMSG_TAIL(&req.n) - (void *)linkinfo; addattr_nest_end(&req.n, linkinfo);
} else if (flags & NLM_F_CREATE) { } else if (flags & NLM_F_CREATE) {
fprintf(stderr, "Not enough information: \"type\" argument " fprintf(stderr, "Not enough information: \"type\" argument "
"is required\n"); "is required\n");