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

iplink: whitespace cleanup 

Break lines to conform to 80 col guideline.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Stephen Hemminger 2017-05-01 09:12:27 -07:00
parent 432b92a702
commit bb6ab47b16
1 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
ip/iplink.c
View File

@ -63,7 +63,8 @@ void iplink_usage(void)
" [ { up | down } ]\n" " [ { up | down } ]\n"
" [ type TYPE ARGS ]\n"); " [ type TYPE ARGS ]\n");
} else } else
fprintf(stderr, "Usage: ip link set DEVICE [ { up | down } ]\n"); fprintf(stderr,
"Usage: ip link set DEVICE [ { up | down } ]\n");
fprintf(stderr, fprintf(stderr,
" [ arp { on | off } ]\n" " [ arp { on | off } ]\n"
@ -298,7 +299,8 @@ static void iplink_parse_vf_vlan_info(int vf, int *argcp, char ***argvp,
SPRINT_BUF(b2); SPRINT_BUF(b2);
char msg[64 + sizeof(b1) + sizeof(b2)]; char msg[64 + sizeof(b1) + sizeof(b2)];
sprintf(msg, "Invalid \"vlan protocol\" value - supported %s, %s\n", sprintf(msg,
"Invalid \"vlan protocol\" value - supported %s, %s\n",
ll_proto_n2a(htons(ETH_P_8021Q), ll_proto_n2a(htons(ETH_P_8021Q),
b1, sizeof(b1)), b1, sizeof(b1)),
ll_proto_n2a(htons(ETH_P_8021AD), ll_proto_n2a(htons(ETH_P_8021AD),
@ -583,14 +585,16 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req,
addr_len = ll_addr_a2n(abuf, sizeof(abuf), *argv); addr_len = ll_addr_a2n(abuf, sizeof(abuf), *argv);
if (addr_len < 0) if (addr_len < 0)
return -1; return -1;
addattr_l(&req->n, sizeof(*req), IFLA_ADDRESS, abuf, addr_len); addattr_l(&req->n, sizeof(*req),
IFLA_ADDRESS, abuf, addr_len);
} else if (matches(*argv, "broadcast") == 0 || } else if (matches(*argv, "broadcast") == 0 ||
strcmp(*argv, "brd") == 0) { strcmp(*argv, "brd") == 0) {
NEXT_ARG(); NEXT_ARG();
len = ll_addr_a2n(abuf, sizeof(abuf), *argv); len = ll_addr_a2n(abuf, sizeof(abuf), *argv);
if (len < 0) if (len < 0)
return -1; return -1;
addattr_l(&req->n, sizeof(*req), IFLA_BROADCAST, abuf, len); addattr_l(&req->n, sizeof(*req),
IFLA_BROADCAST, abuf, len);
} else if (matches(*argv, "txqueuelen") == 0 || } else if (matches(*argv, "txqueuelen") == 0 ||
strcmp(*argv, "qlen") == 0 || strcmp(*argv, "qlen") == 0 ||
matches(*argv, "txqlen") == 0) { matches(*argv, "txqlen") == 0) {
@ -599,7 +603,8 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req,
duparg("txqueuelen", *argv); duparg("txqueuelen", *argv);
if (get_integer(&qlen, *argv, 0)) if (get_integer(&qlen, *argv, 0))
invarg("Invalid \"txqueuelen\" value\n", *argv); invarg("Invalid \"txqueuelen\" value\n", *argv);
addattr_l(&req->n, sizeof(*req), IFLA_TXQLEN, &qlen, 4); addattr_l(&req->n, sizeof(*req),
IFLA_TXQLEN, &qlen, 4);
} else if (strcmp(*argv, "mtu") == 0) { } else if (strcmp(*argv, "mtu") == 0) {
NEXT_ARG(); NEXT_ARG();
if (mtu != -1) if (mtu != -1)
@ -620,8 +625,8 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req,
addattr_l(&req->n, sizeof(*req), IFLA_NET_NS_FD, addattr_l(&req->n, sizeof(*req), IFLA_NET_NS_FD,
&netns, 4); &netns, 4);
else if (get_integer(&netns, *argv, 0) == 0) else if (get_integer(&netns, *argv, 0) == 0)
addattr_l(&req->n, sizeof(*req), IFLA_NET_NS_PID, addattr_l(&req->n, sizeof(*req),
&netns, 4); IFLA_NET_NS_PID, &netns, 4);
else else
invarg("Invalid \"netns\" value\n", *argv); invarg("Invalid \"netns\" value\n", *argv);
} else if (strcmp(*argv, "multicast") == 0) { } else if (strcmp(*argv, "multicast") == 0) {
@ -676,6 +681,7 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req,
return on_off("arp", *argv); return on_off("arp", *argv);
} else if (strcmp(*argv, "carrier") == 0) { } else if (strcmp(*argv, "carrier") == 0) {
int carrier; int carrier;
NEXT_ARG(); NEXT_ARG();
if (strcmp(*argv, "on") == 0) if (strcmp(*argv, "on") == 0)
carrier = 1; carrier = 1;
@ -775,7 +781,8 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req,
if (numtxqueues != -1) if (numtxqueues != -1)
duparg("numtxqueues", *argv); duparg("numtxqueues", *argv);
if (get_integer(&numtxqueues, *argv, 0)) if (get_integer(&numtxqueues, *argv, 0))
invarg("Invalid \"numtxqueues\" value\n", *argv); invarg("Invalid \"numtxqueues\" value\n",
*argv);
addattr_l(&req->n, sizeof(*req), IFLA_NUM_TX_QUEUES, addattr_l(&req->n, sizeof(*req), IFLA_NUM_TX_QUEUES,
&numtxqueues, 4); &numtxqueues, 4);
} else if (matches(*argv, "numrxqueues") == 0) { } else if (matches(*argv, "numrxqueues") == 0) {
@ -783,7 +790,8 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req,
if (numrxqueues != -1) if (numrxqueues != -1)
duparg("numrxqueues", *argv); duparg("numrxqueues", *argv);
if (get_integer(&numrxqueues, *argv, 0)) if (get_integer(&numrxqueues, *argv, 0))
invarg("Invalid \"numrxqueues\" value\n", *argv); invarg("Invalid \"numrxqueues\" value\n",
*argv);
addattr_l(&req->n, sizeof(*req), IFLA_NUM_RX_QUEUES, addattr_l(&req->n, sizeof(*req), IFLA_NUM_RX_QUEUES,
&numrxqueues, 4); &numrxqueues, 4);
} else if (matches(*argv, "addrgenmode") == 0) { } else if (matches(*argv, "addrgenmode") == 0) {
@ -793,7 +801,8 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req,
NEXT_ARG(); NEXT_ARG();
mode = get_addr_gen_mode(*argv); mode = get_addr_gen_mode(*argv);
if (mode < 0) if (mode < 0)
invarg("Invalid address generation mode\n", *argv); invarg("Invalid address generation mode\n",
*argv);
afs = addattr_nest(&req->n, sizeof(*req), IFLA_AF_SPEC); afs = addattr_nest(&req->n, sizeof(*req), IFLA_AF_SPEC);
afs6 = addattr_nest(&req->n, sizeof(*req), AF_INET6); afs6 = addattr_nest(&req->n, sizeof(*req), AF_INET6);
addattr8(&req->n, sizeof(*req), addattr8(&req->n, sizeof(*req),
@ -805,7 +814,8 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req,
if (link_netnsid != -1) if (link_netnsid != -1)
duparg("link-netnsid", *argv); duparg("link-netnsid", *argv);
if (get_integer(&link_netnsid, *argv, 0)) if (get_integer(&link_netnsid, *argv, 0))
invarg("Invalid \"link-netnsid\" value\n", *argv); invarg("Invalid \"link-netnsid\" value\n",
*argv);
addattr32(&req->n, sizeof(*req), IFLA_LINK_NETNSID, addattr32(&req->n, sizeof(*req), IFLA_LINK_NETNSID,
link_netnsid); link_netnsid);
} else if (strcmp(*argv, "protodown") == 0) { } else if (strcmp(*argv, "protodown") == 0) {
@ -886,7 +896,8 @@ static int iplink_modify(int cmd, unsigned int flags, int argc, char **argv)
return -1; return -1;
} }
if (flags & NLM_F_CREATE) { if (flags & NLM_F_CREATE) {
fprintf(stderr, "group cannot be used when creating devices.\n"); fprintf(stderr,
"group cannot be used when creating devices.\n");
return -1; return -1;
} }
@ -900,11 +911,13 @@ static int iplink_modify(int cmd, unsigned int flags, int argc, char **argv)
if (!(flags & NLM_F_CREATE)) { if (!(flags & NLM_F_CREATE)) {
if (!dev) { if (!dev) {
fprintf(stderr, "Not enough information: \"dev\" argument is required.\n"); fprintf(stderr,
"Not enough information: \"dev\" argument is required.\n");
exit(-1); exit(-1);
} }
if (cmd == RTM_NEWLINK && index != -1) { if (cmd == RTM_NEWLINK && index != -1) {
fprintf(stderr, "index can be used only when creating devices.\n"); fprintf(stderr,
"index can be used only when creating devices.\n");
exit(-1); exit(-1);
} }
@ -961,8 +974,9 @@ static int iplink_modify(int cmd, unsigned int flags, int argc, char **argv)
else else
iflatype = IFLA_INFO_DATA; iflatype = IFLA_INFO_DATA;
if (lu && argc) { if (lu && argc) {
struct rtattr *data = addattr_nest(&req.n, struct rtattr *data
sizeof(req), iflatype); = addattr_nest(&req.n,
sizeof(req), iflatype);
if (lu->parse_opt && if (lu->parse_opt &&
lu->parse_opt(lu, argc, argv, &req.n)) lu->parse_opt(lu, argc, argv, &req.n))
@ -979,7 +993,8 @@ static int iplink_modify(int cmd, unsigned int flags, int argc, char **argv)
} }
addattr_nest_end(&req.n, 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 is required\n"); fprintf(stderr,
"Not enough information: \"type\" argument is required\n");
return -1; return -1;
} }
@ -1187,7 +1202,8 @@ static int parse_address(const char *dev, int hatype, int halen,
if (alen < 0) if (alen < 0)
return -1; return -1;
if (alen != halen) { if (alen != halen) {
fprintf(stderr, "Wrong address (%s) length: expected %d bytes\n", fprintf(stderr,
"Wrong address (%s) length: expected %d bytes\n",
lla, halen); lla, halen);
return -1; return -1;
} }
@ -1338,18 +1354,21 @@ static int do_set(int argc, char **argv)
if (halen < 0) if (halen < 0)
return -1; return -1;
if (newaddr) { if (newaddr) {
if (parse_address(dev, htype, halen, newaddr, &ifr0) < 0) if (parse_address(dev, htype, halen,
newaddr, &ifr0) < 0)
return -1; return -1;
} }
if (newbrd) { if (newbrd) {
if (parse_address(dev, htype, halen, newbrd, &ifr1) < 0) if (parse_address(dev, htype, halen,
newbrd, &ifr1) < 0)
return -1; return -1;
} }
} }
if (newname && strcmp(dev, newname)) { if (newname && strcmp(dev, newname)) {
if (strlen(newname) == 0) if (strlen(newname) == 0)
invarg("\"\" is not a valid device identifier\n", "name"); invarg("\"\" is not a valid device identifier\n",
"name");
if (do_changename(dev, newname) < 0) if (do_changename(dev, newname) < 0)
return -1; return -1;
dev = newname; dev = newname;