ip: iplink: Convert to use parse_on_off()

[mirror_iproute2.git] / ip / iplink.c

diff --git a/ip/iplink.c b/ip/iplink.c
index d6b766de1fcf22c9ee11559bb44ee8496494b2af..f5766c39507b22853a94e47292fcb27dd82ed7eb 100644 (file)
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -352,6 +352,7 @@ static int iplink_parse_vf(int vf, int *argcp, char ***argvp,
        int len, argc = *argcp;
        char **argv = *argvp;
        struct rtattr *vfinfo;
+       int ret;
 
        tivt.min_tx_rate = -1;
        tivt.max_tx_rate = -1;
@@ -464,12 +465,9 @@ static int iplink_parse_vf(int vf, int *argcp, char ***argvp,
                        struct ifla_vf_spoofchk ivs;
 
                        NEXT_ARG();
-                       if (matches(*argv, "on") == 0)
-                               ivs.setting = 1;
-                       else if (matches(*argv, "off") == 0)
-                               ivs.setting = 0;
-                       else
-                               return on_off("spoofchk", *argv);
+                       ivs.setting = parse_on_off("spoofchk", *argv, &ret);
+                       if (ret)
+                               return ret;
                        ivs.vf = vf;
                        addattr_l(&req->n, sizeof(*req), IFLA_VF_SPOOFCHK,
                                  &ivs, sizeof(ivs));
@@ -478,12 +476,9 @@ static int iplink_parse_vf(int vf, int *argcp, char ***argvp,
                        struct ifla_vf_rss_query_en ivs;
 
                        NEXT_ARG();
-                       if (matches(*argv, "on") == 0)
-                               ivs.setting = 1;
-                       else if (matches(*argv, "off") == 0)
-                               ivs.setting = 0;
-                       else
-                               return on_off("query_rss", *argv);
+                       ivs.setting = parse_on_off("query_rss", *argv, &ret);
+                       if (ret)
+                               return ret;
                        ivs.vf = vf;
                        addattr_l(&req->n, sizeof(*req), IFLA_VF_RSS_QUERY_EN,
                                  &ivs, sizeof(ivs));
@@ -492,12 +487,9 @@ static int iplink_parse_vf(int vf, int *argcp, char ***argvp,
                        struct ifla_vf_trust ivt;
 
                        NEXT_ARG();
-                       if (matches(*argv, "on") == 0)
-                               ivt.setting = 1;
-                       else if (matches(*argv, "off") == 0)
-                               ivt.setting = 0;
-                       else
-                               invarg("Invalid \"trust\" value\n", *argv);
+                       ivt.setting = parse_on_off("trust", *argv, &ret);
+                       if (ret)
+                               return ret;
                        ivt.vf = vf;
                        addattr_l(&req->n, sizeof(*req), IFLA_VF_TRUST,
                                  &ivt, sizeof(ivt));
@@ -595,6 +587,7 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req, char **type)
        int index = 0;
        int group = -1;
        int addr_len = 0;
+       int err;
 
        ret = argc;
 
@@ -738,12 +731,9 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req, char **type)
                        int carrier;
 
                        NEXT_ARG();
-                       if (strcmp(*argv, "on") == 0)
-                               carrier = 1;
-                       else if (strcmp(*argv, "off") == 0)
-                               carrier = 0;
-                       else
-                               return on_off("carrier", *argv);
+                       carrier = parse_on_off("carrier", *argv, &err);
+                       if (err)
+                               return err;
 
                        addattr8(&req->n, sizeof(*req), IFLA_CARRIER, carrier);
                } else if (strcmp(*argv, "vf") == 0) {
@@ -896,12 +886,9 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req, char **type)
                        unsigned int proto_down;
 
                        NEXT_ARG();
-                       if (strcmp(*argv, "on") == 0)
-                               proto_down = 1;
-                       else if (strcmp(*argv, "off") == 0)
-                               proto_down = 0;
-                       else
-                               return on_off("protodown", *argv);
+                       proto_down = parse_on_off("protodown", *argv, &err);
+                       if (err)
+                               return err;
                        addattr8(&req->n, sizeof(*req), IFLA_PROTO_DOWN,
                                 proto_down);
                } else if (strcmp(*argv, "protodown_reason") == 0) {