diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2015-10-14 13:21:01 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2015-10-14 13:21:01 +0200 |
commit | 0f296a3a56b52842057e5a2bc653621a3a6c7bec (patch) | |
tree | c504475cbf18d845698097e6b3b9656e0040d373 /networking/libiproute/iplink.c | |
parent | 69934701fd1b18327b3a779cb292a728834b2d0d (diff) | |
download | busybox-w32-0f296a3a56b52842057e5a2bc653621a3a6c7bec.tar.gz busybox-w32-0f296a3a56b52842057e5a2bc653621a3a6c7bec.tar.bz2 busybox-w32-0f296a3a56b52842057e5a2bc653621a3a6c7bec.zip |
libiproute: rename invarg(a,b) to invarg_1_to_2(a,b)
invarg(a,b) - "invalid argument", but how a and b enter the message?
invarg_1_to_2(a,b) is somewhat easier to read: "invalid argument 'a' to 'b'"
Audit of usage revealed a number of bad uses, with too long messages.
text data bss dec hex filename
938848 932 17448 957228 e9b2c busybox_old
938788 932 17448 957168 e9af0 busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/libiproute/iplink.c')
-rw-r--r-- | networking/libiproute/iplink.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c index 5c27c2de3..ae3ef0ceb 100644 --- a/networking/libiproute/iplink.c +++ b/networking/libiproute/iplink.c | |||
@@ -349,7 +349,7 @@ static void vlan_parse_opt(char **argv, struct nlmsghdr *n, unsigned int size) | |||
349 | while (*argv) { | 349 | while (*argv) { |
350 | arg = index_in_substrings(keywords, *argv); | 350 | arg = index_in_substrings(keywords, *argv); |
351 | if (arg < 0) | 351 | if (arg < 0) |
352 | invarg(*argv, "type vlan"); | 352 | invarg_1_to_2(*argv, "type vlan"); |
353 | 353 | ||
354 | NEXT_ARG(); | 354 | NEXT_ARG(); |
355 | if (arg == ARG_id) { | 355 | if (arg == ARG_id) { |
@@ -512,7 +512,7 @@ static int do_add_or_delete(char **argv, const unsigned rtm) | |||
512 | if (name_str) { | 512 | if (name_str) { |
513 | const size_t name_len = strlen(name_str) + 1; | 513 | const size_t name_len = strlen(name_str) + 1; |
514 | if (name_len < 2 || name_len > IFNAMSIZ) | 514 | if (name_len < 2 || name_len > IFNAMSIZ) |
515 | invarg(name_str, "name"); | 515 | invarg_1_to_2(name_str, "name"); |
516 | addattr_l(&req.n, sizeof(req), IFLA_IFNAME, name_str, name_len); | 516 | addattr_l(&req.n, sizeof(req), IFLA_IFNAME, name_str, name_len); |
517 | } | 517 | } |
518 | if (rtnl_talk(&rth, &req.n, 0, 0, NULL, NULL, NULL) < 0) | 518 | if (rtnl_talk(&rth, &req.n, 0, 0, NULL, NULL, NULL) < 0) |
@@ -536,14 +536,14 @@ static int do_add_or_delete(char **argv, const unsigned rtm) | |||
536 | if (qlen != -1) | 536 | if (qlen != -1) |
537 | duparg("txqueuelen", *argv); | 537 | duparg("txqueuelen", *argv); |
538 | if (get_integer(&qlen, *argv, 0)) | 538 | if (get_integer(&qlen, *argv, 0)) |
539 | invarg("Invalid \"txqueuelen\" value\n", *argv); | 539 | invarg_1_to_2(*argv, "txqueuelen"); |
540 | addattr_l(&req->n, sizeof(*req), IFLA_TXQLEN, &qlen, 4); | 540 | addattr_l(&req->n, sizeof(*req), IFLA_TXQLEN, &qlen, 4); |
541 | } else if (strcmp(*argv, "mtu") == 0) { | 541 | } else if (strcmp(*argv, "mtu") == 0) { |
542 | NEXT_ARG(); | 542 | NEXT_ARG(); |
543 | if (mtu != -1) | 543 | if (mtu != -1) |
544 | duparg("mtu", *argv); | 544 | duparg("mtu", *argv); |
545 | if (get_integer(&mtu, *argv, 0)) | 545 | if (get_integer(&mtu, *argv, 0)) |
546 | invarg("Invalid \"mtu\" value\n", *argv); | 546 | invarg_1_to_2(*argv, "mtu"); |
547 | addattr_l(&req->n, sizeof(*req), IFLA_MTU, &mtu, 4); | 547 | addattr_l(&req->n, sizeof(*req), IFLA_MTU, &mtu, 4); |
548 | } else if (strcmp(*argv, "netns") == 0) { | 548 | } else if (strcmp(*argv, "netns") == 0) { |
549 | NEXT_ARG(); | 549 | NEXT_ARG(); |
@@ -554,7 +554,7 @@ static int do_add_or_delete(char **argv, const unsigned rtm) | |||
554 | else if (get_integer(&netns, *argv, 0) == 0) | 554 | else if (get_integer(&netns, *argv, 0) == 0) |
555 | addattr_l(&req->n, sizeof(*req), IFLA_NET_NS_PID, &netns, 4); | 555 | addattr_l(&req->n, sizeof(*req), IFLA_NET_NS_PID, &netns, 4); |
556 | else | 556 | else |
557 | invarg("Invalid \"netns\" value\n", *argv); | 557 | invarg_1_to_2(*argv, "netns"); |
558 | } else if (strcmp(*argv, "multicast") == 0) { | 558 | } else if (strcmp(*argv, "multicast") == 0) { |
559 | NEXT_ARG(); | 559 | NEXT_ARG(); |
560 | req->i.ifi_change |= IFF_MULTICAST; | 560 | req->i.ifi_change |= IFF_MULTICAST; |
@@ -604,7 +604,7 @@ static int do_add_or_delete(char **argv, const unsigned rtm) | |||
604 | struct rtattr *vflist; | 604 | struct rtattr *vflist; |
605 | NEXT_ARG(); | 605 | NEXT_ARG(); |
606 | if (get_integer(&vf, *argv, 0)) { | 606 | if (get_integer(&vf, *argv, 0)) { |
607 | invarg("Invalid \"vf\" value\n", *argv); | 607 | invarg_1_to_2(*argv, "vf"); |
608 | } | 608 | } |
609 | vflist = addattr_nest(&req->n, sizeof(*req), | 609 | vflist = addattr_nest(&req->n, sizeof(*req), |
610 | IFLA_VFINFO_LIST); | 610 | IFLA_VFINFO_LIST); |
@@ -617,7 +617,7 @@ static int do_add_or_delete(char **argv, const unsigned rtm) | |||
617 | NEXT_ARG(); | 617 | NEXT_ARG(); |
618 | ifindex = ll_name_to_index(*argv); | 618 | ifindex = ll_name_to_index(*argv); |
619 | if (!ifindex) | 619 | if (!ifindex) |
620 | invarg("Device does not exist\n", *argv); | 620 | invarg_1_to_2(*argv, "master"); |
621 | addattr_l(&req->n, sizeof(*req), IFLA_MASTER, | 621 | addattr_l(&req->n, sizeof(*req), IFLA_MASTER, |
622 | &ifindex, 4); | 622 | &ifindex, 4); |
623 | } else if (matches(*argv, "nomaster") == 0) { | 623 | } else if (matches(*argv, "nomaster") == 0) { |
@@ -644,28 +644,27 @@ static int do_add_or_delete(char **argv, const unsigned rtm) | |||
644 | if (*group != -1) | 644 | if (*group != -1) |
645 | duparg("group", *argv); | 645 | duparg("group", *argv); |
646 | if (rtnl_group_a2n(group, *argv)) | 646 | if (rtnl_group_a2n(group, *argv)) |
647 | invarg("Invalid \"group\" value\n", *argv); | 647 | invarg_1_to_2(*argv, "group"); |
648 | } else if (strcmp(*argv, "mode") == 0) { | 648 | } else if (strcmp(*argv, "mode") == 0) { |
649 | int mode; | 649 | int mode; |
650 | NEXT_ARG(); | 650 | NEXT_ARG(); |
651 | mode = get_link_mode(*argv); | 651 | mode = get_link_mode(*argv); |
652 | if (mode < 0) | 652 | if (mode < 0) |
653 | invarg("Invalid link mode\n", *argv); | 653 | invarg_1_to_2(*argv, "mode"); |
654 | addattr8(&req->n, sizeof(*req), IFLA_LINKMODE, mode); | 654 | addattr8(&req->n, sizeof(*req), IFLA_LINKMODE, mode); |
655 | } else if (strcmp(*argv, "state") == 0) { | 655 | } else if (strcmp(*argv, "state") == 0) { |
656 | int state; | 656 | int state; |
657 | NEXT_ARG(); | 657 | NEXT_ARG(); |
658 | state = get_operstate(*argv); | 658 | state = get_operstate(*argv); |
659 | if (state < 0) | 659 | if (state < 0) |
660 | invarg("Invalid operstate\n", *argv); | 660 | invarg_1_to_2(*argv, "state"); |
661 | |||
662 | addattr8(&req->n, sizeof(*req), IFLA_OPERSTATE, state); | 661 | addattr8(&req->n, sizeof(*req), IFLA_OPERSTATE, state); |
663 | } else if (matches(*argv, "numtxqueues") == 0) { | 662 | } else if (matches(*argv, "numtxqueues") == 0) { |
664 | NEXT_ARG(); | 663 | NEXT_ARG(); |
665 | if (numtxqueues != -1) | 664 | if (numtxqueues != -1) |
666 | duparg("numtxqueues", *argv); | 665 | duparg("numtxqueues", *argv); |
667 | if (get_integer(&numtxqueues, *argv, 0)) | 666 | if (get_integer(&numtxqueues, *argv, 0)) |
668 | invarg("Invalid \"numtxqueues\" value\n", *argv); | 667 | invarg_1_to_2(*argv, "numtxqueues"); |
669 | addattr_l(&req->n, sizeof(*req), IFLA_NUM_TX_QUEUES, | 668 | addattr_l(&req->n, sizeof(*req), IFLA_NUM_TX_QUEUES, |
670 | &numtxqueues, 4); | 669 | &numtxqueues, 4); |
671 | } else if (matches(*argv, "numrxqueues") == 0) { | 670 | } else if (matches(*argv, "numrxqueues") == 0) { |
@@ -673,7 +672,7 @@ static int do_add_or_delete(char **argv, const unsigned rtm) | |||
673 | if (numrxqueues != -1) | 672 | if (numrxqueues != -1) |
674 | duparg("numrxqueues", *argv); | 673 | duparg("numrxqueues", *argv); |
675 | if (get_integer(&numrxqueues, *argv, 0)) | 674 | if (get_integer(&numrxqueues, *argv, 0)) |
676 | invarg("Invalid \"numrxqueues\" value\n", *argv); | 675 | invarg_1_to_2(*argv, "numrxqueues"); |
677 | addattr_l(&req->n, sizeof(*req), IFLA_NUM_RX_QUEUES, | 676 | addattr_l(&req->n, sizeof(*req), IFLA_NUM_RX_QUEUES, |
678 | &numrxqueues, 4); | 677 | &numrxqueues, 4); |
679 | } | 678 | } |
@@ -687,7 +686,7 @@ int FAST_FUNC do_iplink(char **argv) | |||
687 | if (*argv) { | 686 | if (*argv) { |
688 | int key = index_in_substrings(keywords, *argv); | 687 | int key = index_in_substrings(keywords, *argv); |
689 | if (key < 0) /* invalid argument */ | 688 | if (key < 0) /* invalid argument */ |
690 | invarg(*argv, applet_name); | 689 | invarg_1_to_2(*argv, applet_name); |
691 | argv++; | 690 | argv++; |
692 | if (key <= 1) /* add/delete */ | 691 | if (key <= 1) /* add/delete */ |
693 | return do_add_or_delete(argv, key ? RTM_DELLINK : RTM_NEWLINK); | 692 | return do_add_or_delete(argv, key ? RTM_DELLINK : RTM_NEWLINK); |