ip: move get_failed blocks

Rather than doing goto back into the middle of an earlier
if() statement. Move the error returns to the end of the functions
to follow kernel coding practice.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/ip/link_gre.c b/ip/link_gre.c
index 6d71864c1999559750dbce60526ef0aca83c264d..010b4824b80947804ab7eb85b60d8e5855b87a6f 100644 (file)
--- a/ip/link_gre.c
+++ b/ip/link_gre.c
@@ -109,13 +109,8 @@ static int gre_parse_opt(struct link_util *lu, int argc, char **argv,
        if (!(n->nlmsg_flags & NLM_F_CREATE)) {
                const struct rtattr *rta;
 
-               if (rtnl_talk(&rth, &req.n, &answer) < 0) {
-get_failed:
-                       fprintf(stderr,
-                               "Failed to get existing tunnel info.\n");
-                       free(answer);
-                       return -1;
-               }
+               if (rtnl_talk(&rth, &req.n, &answer) < 0)
+                       goto get_failed;
 
                len = answer->nlmsg_len;
                len -= NLMSG_LENGTH(sizeof(*ifi));
@@ -423,6 +418,11 @@ get_failed:
        addattr16(n, 1024, IFLA_GRE_ENCAP_DPORT, htons(encapdport));
 
        return 0;
+
+get_failed:
+       fprintf(stderr, "Failed to get existing tunnel info.\n");
+       free(answer);
+       return -1;
 }
 
 static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])

diff --git a/ip/link_gre6.c b/ip/link_gre6.c
index 4d1c657488c45cee589d499285dd2826efe91f00..fc3e35f7e83f4e5f9b4ae1fa3fdf1f7c9e9ca853 100644 (file)
--- a/ip/link_gre6.c
+++ b/ip/link_gre6.c
@@ -111,13 +111,8 @@ static int gre_parse_opt(struct link_util *lu, int argc, char **argv,
        if (!(n->nlmsg_flags & NLM_F_CREATE)) {
                const struct rtattr *rta;
 
-               if (rtnl_talk(&rth, &req.n, &answer) < 0) {
-get_failed:
-                       fprintf(stderr,
-                               "Failed to get existing tunnel info.\n");
-                       free(answer);
-                       return -1;
-               }
+               if (rtnl_talk(&rth, &req.n, &answer) < 0)
+                       goto get_failed;
 
                len = answer->nlmsg_len;
                len -= NLMSG_LENGTH(sizeof(*ifi));
@@ -441,6 +436,11 @@ get_failed:
        addattr16(n, 1024, IFLA_GRE_ENCAP_DPORT, htons(encapdport));
 
        return 0;
+
+get_failed:
+       fprintf(stderr, "Failed to get existing tunnel info.\n");
+       free(answer);
+       return -1;
 }
 
 static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])

diff --git a/ip/link_ip6tnl.c b/ip/link_ip6tnl.c
index 3a30dca9398068681e378b3f90d5dafc22c59bae..c2a05cee35bb0884740df11c08a99003a2a4404d 100644 (file)
--- a/ip/link_ip6tnl.c
+++ b/ip/link_ip6tnl.c
@@ -97,13 +97,8 @@ static int ip6tunnel_parse_opt(struct link_util *lu, int argc, char **argv,
        if (!(n->nlmsg_flags & NLM_F_CREATE)) {
                const struct rtattr *rta;
 
-               if (rtnl_talk(&rth, &req.n, &answer) < 0) {
-get_failed:
-                       fprintf(stderr,
-                               "Failed to get existing tunnel info.\n");
-                       free(answer);
-                       return -1;
-               }
+               if (rtnl_talk(&rth, &req.n, &answer) < 0)
+                       goto get_failed;
 
                len = answer->nlmsg_len;
                len -= NLMSG_LENGTH(sizeof(*ifi));
@@ -326,6 +321,11 @@ get_failed:
        addattr16(n, 1024, IFLA_IPTUN_ENCAP_DPORT, htons(encapdport));
 
        return 0;
+
+get_failed:
+       fprintf(stderr, "Failed to get existing tunnel info.\n");
+       free(answer);
+       return -1;
 }
 
 static void ip6tunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])

diff --git a/ip/link_iptnl.c b/ip/link_iptnl.c
index 879202f71155c42a72467061830bb3ab8383c5c0..49c3ae2612ca8ea9c2b4a82a1a8cfdb3f7872559 100644 (file)
--- a/ip/link_iptnl.c
+++ b/ip/link_iptnl.c
@@ -101,13 +101,8 @@ static int iptunnel_parse_opt(struct link_util *lu, int argc, char **argv,
        if (!(n->nlmsg_flags & NLM_F_CREATE)) {
                const struct rtattr *rta;
 
-               if (rtnl_talk(&rth, &req.n, &answer) < 0) {
-get_failed:
-                       fprintf(stderr,
-                               "Failed to get existing tunnel info.\n");
-                       free(answer);
-                       return -1;
-               }
+               if (rtnl_talk(&rth, &req.n, &answer) < 0)
+                       goto get_failed;
 
                len = answer->nlmsg_len;
                len -= NLMSG_LENGTH(sizeof(*ifi));
@@ -350,6 +345,11 @@ get_failed:
        }
 
        return 0;
+
+get_failed:
+       fprintf(stderr, "Failed to get existing tunnel info.\n");
+       free(answer);
+       return -1;
 }
 
 static void iptunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])

diff --git a/ip/link_vti.c b/ip/link_vti.c
index 7a95dc02dc08d1de184c0ef44dafbf41b003149b..2106a9d2cee3fc2ab864fed1876e76e5d44d5e5a 100644 (file)
--- a/ip/link_vti.c
+++ b/ip/link_vti.c
@@ -65,13 +65,8 @@ static int vti_parse_opt(struct link_util *lu, int argc, char **argv,
        if (!(n->nlmsg_flags & NLM_F_CREATE)) {
                const struct rtattr *rta;
 
-               if (rtnl_talk(&rth, &req.n, &answer) < 0) {
-get_failed:
-                       fprintf(stderr,
-                               "Failed to get existing tunnel info.\n");
-                       free(answer);
-                       return -1;
-               }
+               if (rtnl_talk(&rth, &req.n, &answer) < 0)
+                       goto get_failed;
 
                len = answer->nlmsg_len;
                len -= NLMSG_LENGTH(sizeof(*ifi));
@@ -157,6 +152,11 @@ get_failed:
                addattr32(n, 1024, IFLA_VTI_LINK, link);
 
        return 0;
+
+get_failed:
+       fprintf(stderr, "Failed to get existing tunnel info.\n");
+       free(answer);
+       return -1;
 }
 
 static void vti_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])

diff --git a/ip/link_vti6.c b/ip/link_vti6.c
index aaf701d332989a7893d620a023f52346749fab52..7362f336a8958361aa8d1993d4601090efe9c71b 100644 (file)
--- a/ip/link_vti6.c
+++ b/ip/link_vti6.c
@@ -67,13 +67,8 @@ static int vti6_parse_opt(struct link_util *lu, int argc, char **argv,
        if (!(n->nlmsg_flags & NLM_F_CREATE)) {
                const struct rtattr *rta;
 
-               if (rtnl_talk(&rth, &req.n, &answer) < 0) {
-get_failed:
-                       fprintf(stderr,
-                               "Failed to get existing tunnel info.\n");
-                       free(answer);
-                       return -1;
-               }
+               if (rtnl_talk(&rth, &req.n, &answer) < 0)
+                       goto get_failed;
 
                len = answer->nlmsg_len;
                len -= NLMSG_LENGTH(sizeof(*ifi));
@@ -159,6 +154,11 @@ get_failed:
                addattr32(n, 1024, IFLA_VTI_LINK, link);
 
        return 0;
+
+get_failed:
+       fprintf(stderr, "Failed to get existing tunnel info.\n");
+       free(answer);
+       return -1;
 }
 
 static void vti6_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])