utils: invarg: msg precedes the faulty arg

fix all call which reversed the arg order.

Signed-off-by: Dan Kenigsberg <danken@redhat.com>

diff --git a/ip/ip.c b/ip/ip.c
index 20dc3b568f1170a15b3a443c3d3a9bab43930562..4e8ac5cd4543061def4b20d0f95804811458dd7d 100644 (file)
--- a/ip/ip.c
+++ b/ip/ip.c
@@ -188,7 +188,7 @@ int main(int argc, char **argv)
                        else if (strcmp(argv[1], "help") == 0)
                                usage();
                        else
-                               invarg(argv[1], "invalid protocol family");
+                               invarg("invalid protocol family", argv[1]);
                } else if (strcmp(opt, "-4") == 0) {
                        preferred_family = AF_INET;
                } else if (strcmp(opt, "-6") == 0) {

diff --git a/ip/ipaddress.c b/ip/ipaddress.c
index 69a63b3142f3d2340d2ee0bd6fb17516e0515559..cbff1433bb8528d208300405f073a87a19dcd650 100644 (file)
--- a/ip/ipaddress.c
+++ b/ip/ipaddress.c
@@ -1147,7 +1147,7 @@ static int ipaddr_modify(int cmd, int flags, int argc, char **argv)
                        unsigned scope = 0;
                        NEXT_ARG();
                        if (rtnl_rtscope_a2n(&scope, *argv))
-                               invarg(*argv, "invalid scope value.");
+                               invarg("invalid scope value.", *argv);
                        req.ifa.ifa_scope = scope;
                        scoped = 1;
                } else if (strcmp(*argv, "dev") == 0) {

diff --git a/tc/tc_class.c b/tc/tc_class.c
index de18fd11524201daf251ac80b4ff739fa376a3c6..95bf6156428550af6059c0da9ccdcd973d44fcd9 100644 (file)
--- a/tc/tc_class.c
+++ b/tc/tc_class.c
@@ -74,7 +74,7 @@ int tc_class_modify(int cmd, unsigned flags, int argc, char **argv)
                        if (req.t.tcm_handle)
                                duparg("classid", *argv);
                        if (get_tc_classid(&handle, *argv))
-                               invarg(*argv, "invalid class ID");
+                               invarg("invalid class ID", *argv);
                        req.t.tcm_handle = handle;
                } else if (strcmp(*argv, "handle") == 0) {
                        fprintf(stderr, "Error: try \"classid\" instead of \"handle\"\n");
@@ -91,7 +91,7 @@ int tc_class_modify(int cmd, unsigned flags, int argc, char **argv)
                        if (req.t.tcm_parent)
                                duparg("parent", *argv);
                        if (get_tc_classid(&handle, *argv))
-                               invarg(*argv, "invalid parent ID");
+                               invarg("invalid parent ID", *argv);
                        req.t.tcm_parent = handle;
                } else if (matches(*argv, "estimator") == 0) {
                        if (parse_estimator(&argc, &argv, &est))
@@ -252,13 +252,13 @@ int tc_class_list(int argc, char **argv)
                        if (filter_qdisc)
                                duparg("qdisc", *argv);
                        if (get_qdisc_handle(&filter_qdisc, *argv))
-                               invarg(*argv, "invalid qdisc ID");
+                               invarg("invalid qdisc ID", *argv);
                } else if (strcmp(*argv, "classid") == 0) {
                        NEXT_ARG();
                        if (filter_classid)
                                duparg("classid", *argv);
                        if (get_tc_classid(&filter_classid, *argv))
-                               invarg(*argv, "invalid class ID");
+                               invarg("invalid class ID", *argv);
                } else if (strcmp(*argv, "root") == 0) {
                        if (t.tcm_parent) {
                                fprintf(stderr, "Error: \"root\" is duplicate parent ID\n");
@@ -271,7 +271,7 @@ int tc_class_list(int argc, char **argv)
                                duparg("parent", *argv);
                        NEXT_ARG();
                        if (get_tc_classid(&handle, *argv))
-                               invarg(*argv, "invalid parent ID");
+                               invarg("invalid parent ID", *argv);
                        t.tcm_parent = handle;
                } else if (matches(*argv, "help") == 0) {
                        usage();

diff --git a/tc/tc_filter.c b/tc/tc_filter.c
index 04c3b824ba731a98d12acbeb505b6a0b38e24869..c9e09d8eff44fcfa38e86b9ed41043d845c59f82 100644 (file)
--- a/tc/tc_filter.c
+++ b/tc/tc_filter.c
@@ -93,7 +93,7 @@ int tc_filter_modify(int cmd, unsigned flags, int argc, char **argv)
                        if (req.t.tcm_parent)
                                duparg("parent", *argv);
                        if (get_tc_classid(&handle, *argv))
-                               invarg(*argv, "Invalid parent ID");
+                               invarg("Invalid parent ID", *argv);
                        req.t.tcm_parent = handle;
                } else if (strcmp(*argv, "handle") == 0) {
                        NEXT_ARG();
@@ -106,14 +106,14 @@ int tc_filter_modify(int cmd, unsigned flags, int argc, char **argv)
                        if (prio)
                                duparg("priority", *argv);
                        if (get_u32(&prio, *argv, 0) || prio > 0xFFFF)
-                               invarg(*argv, "invalid priority value");
+                               invarg("invalid priority value", *argv);
                } else if (matches(*argv, "protocol") == 0) {
                        __u16 id;
                        NEXT_ARG();
                        if (protocol_set)
                                duparg("protocol", *argv);
                        if (ll_proto_a2n(&id, *argv))
-                               invarg(*argv, "invalid protocol");
+                               invarg("invalid protocol", *argv);
                        protocol = id;
                        protocol_set = 1;
                } else if (matches(*argv, "estimator") == 0) {
@@ -290,7 +290,7 @@ int tc_filter_list(int argc, char **argv)
                        if (t.tcm_parent)
                                duparg("parent", *argv);
                        if (get_tc_classid(&handle, *argv))
-                               invarg(*argv, "invalid parent ID");
+                               invarg("invalid parent ID", *argv);
                        filter_parent = t.tcm_parent = handle;
                } else if (strcmp(*argv, "handle") == 0) {
                        NEXT_ARG();
@@ -303,7 +303,7 @@ int tc_filter_list(int argc, char **argv)
                        if (prio)
                                duparg("priority", *argv);
                        if (get_u32(&prio, *argv, 0))
-                               invarg(*argv, "invalid preference");
+                               invarg("invalid preference", *argv);
                        filter_prio = prio;
                } else if (matches(*argv, "protocol") == 0) {
                        __u16 res;
@@ -311,7 +311,7 @@ int tc_filter_list(int argc, char **argv)
                        if (protocol)
                                duparg("protocol", *argv);
                        if (ll_proto_a2n(&res, *argv))
-                               invarg(*argv, "invalid protocol");
+                               invarg("invalid protocol", *argv);
                        protocol = res;
                        filter_protocol = protocol;
                } else if (matches(*argv, "help") == 0) {

diff --git a/tc/tc_qdisc.c b/tc/tc_qdisc.c
index 3f932a7bdcf060ff152eed413c7674122024942a..c8d7335b746e102f389e137f6c8e9ae367381953 100644 (file)
--- a/tc/tc_qdisc.c
+++ b/tc/tc_qdisc.c
@@ -83,7 +83,7 @@ int tc_qdisc_modify(int cmd, unsigned flags, int argc, char **argv)
                                duparg("handle", *argv);
                        NEXT_ARG();
                        if (get_qdisc_handle(&handle, *argv))
-                               invarg(*argv, "invalid qdisc ID");
+                               invarg("invalid qdisc ID", *argv);
                        req.t.tcm_handle = handle;
                } else if (strcmp(*argv, "root") == 0) {
                        if (req.t.tcm_parent) {
@@ -111,7 +111,7 @@ int tc_qdisc_modify(int cmd, unsigned flags, int argc, char **argv)
                        if (req.t.tcm_parent)
                                duparg("parent", *argv);
                        if (get_tc_classid(&handle, *argv))
-                               invarg(*argv, "invalid parent ID");
+                               invarg("invalid parent ID", *argv);
                        req.t.tcm_parent = handle;
                } else if (matches(*argv, "estimator") == 0) {
                        if (parse_estimator(&argc, &argv, &est))