Changes in uspace/app/inet/inet.c [b8b1adb1:3495654] in mainline

File:

• uspace/app/inet/inet.c (modified) (7 diffs)

uspace/app/inet/inet.c

@@ -44 +44 @@
 #include <sys/types.h>
 
-#define NAME  "inet"
+#define NAME "inet"
 
 static void print_syntax(void)
@@ -257 +257 @@
         if (count > 0)
                 printf("    [Addr/Width] [Link-Name] [Addr-Name] [Def-MTU]\n");
-        ainfo.name = NULL;
-        linfo.name = NULL;
-        astr = NULL;
+        ainfo.name = linfo.name = astr = NULL;
 
         for (i = 0; i < count; i++) {
@@ -292 +290 @@
                 free(astr);
 
-                ainfo.name = NULL;
-                linfo.name = NULL;
-                astr = NULL;
+                ainfo.name = linfo.name = astr = NULL;
         }
 
@@ -312 +308 @@
 }
 
-static int link_list(void)
-{
-        sysarg_t *link_list;
-        inet_link_info_t linfo;
-
-        size_t count;
-        size_t i;
-        int rc;
-
-        rc = inetcfg_get_link_list(&link_list, &count);
-        if (rc != EOK) {
-                printf(NAME ": Failed getting link list.\n");
-                return rc;
-        }
-
-        printf("IP links:\n");
-        if (count > 0)
-                printf("    [Link-layer Address] [Link-Name] [Def-MTU]\n");
-
-        for (i = 0; i < count; i++) {
-                rc = inetcfg_link_get(link_list[i], &linfo);
-                if (rc != EOK) {
-                        printf("Failed getting properties of link %zu.\n",
-                            (size_t)link_list[i]);
-                        continue;
-                }
-
-                printf("    %02x:%02x:%02x:%02x:%02x:%02x %s %zu\n",
-                    linfo.mac_addr[0], linfo.mac_addr[1],
-                    linfo.mac_addr[2], linfo.mac_addr[3],
-                    linfo.mac_addr[4], linfo.mac_addr[5],
-                    linfo.name, linfo.def_mtu);
-
-                free(linfo.name);
-
-                linfo.name = NULL;
-        }
-
-        if (count == 0)
-                printf("    None\n");
-
-        free(link_list);
-
-        return EOK;
-}
-
 static int sroute_list(void)
 {
@@ -379 +329 @@
                 printf("    [Dest/Width] [Router-Addr] [Route-Name]\n");
 
-        srinfo.name = NULL;
-        dest_str = NULL;
-        router_str = NULL;
+        srinfo.name = dest_str = router_str = NULL;
 
         for (i = 0; i < count; i++) {
@@ -412 +360 @@
                 free(router_str);
 
-                router_str = NULL;
-                srinfo.name = NULL;
-                dest_str = NULL;
+                router_str = srinfo.name = dest_str = NULL;
         }
 
@@ -450 +396 @@
                 if (rc != EOK)
                         return 1;
-                rc = link_list();
-                if (rc != EOK)
-                        return 1;
                 return 0;
         }