ip: code cleanup

[mirror_iproute2.git] / ip / link_vti6.c

diff --git a/ip/link_vti6.c b/ip/link_vti6.c
index c146f791abaaab38fdc25b22477121bf3dabfc49..9a62eb5aa370d4ea37bbf0b71be0165c53b35c21 100644 (file)
--- a/ip/link_vti6.c
+++ b/ip/link_vti6.c
@@ -53,9 +53,9 @@ static int vti6_parse_opt(struct link_util *lu, int argc, char **argv,
        struct rtattr *vtiinfo[IFLA_VTI_MAX + 1];
        struct in6_addr saddr;
        struct in6_addr daddr;
-       unsigned ikey = 0;
-       unsigned okey = 0;
-       unsigned link = 0;
+       unsigned int ikey = 0;
+       unsigned int okey = 0;
+       unsigned int link = 0;
        int len;
 
        if (!(n->nlmsg_flags & NLM_F_CREATE)) {
@@ -110,7 +110,7 @@ get_failed:
 
        while (argc > 0) {
                if (!matches(*argv, "key")) {
-                       unsigned uval;
+                       unsigned int uval;
 
                        NEXT_ARG();
                        if (strchr(*argv, '.'))
@@ -126,7 +126,7 @@ get_failed:
 
                        ikey = okey = uval;
                } else if (!matches(*argv, "ikey")) {
-                       unsigned uval;
+                       unsigned int uval;
 
                        NEXT_ARG();
                        if (strchr(*argv, '.'))
@@ -140,7 +140,7 @@ get_failed:
                        }
                        ikey = uval;
                } else if (!matches(*argv, "okey")) {
-                       unsigned uval;
+                       unsigned int uval;
 
                        NEXT_ARG();
                        if (strchr(*argv, '.'))
@@ -160,6 +160,7 @@ get_failed:
                                exit(-1);
                        } else {
                                inet_prefix addr;
+
                                get_prefix(&addr, *argv, AF_INET6);
                                memcpy(&daddr, addr.data, addr.bytelen);
                        }
@@ -170,6 +171,7 @@ get_failed:
                                exit(-1);
                        } else {
                                inet_prefix addr;
+
                                get_prefix(&addr, *argv, AF_INET6);
                                memcpy(&saddr, addr.data, addr.bytelen);
                        }
@@ -222,7 +224,7 @@ static void vti6_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
        fprintf(f, "local %s ", local);
 
        if (tb[IFLA_VTI_LINK] && *(__u32 *)RTA_DATA(tb[IFLA_VTI_LINK])) {
-               unsigned link = *(__u32 *)RTA_DATA(tb[IFLA_VTI_LINK]);
+               unsigned int link = *(__u32 *)RTA_DATA(tb[IFLA_VTI_LINK]);
                const char *n = if_indextoname(link, s2);
 
                if (n)