Changeset eb083ad in mainline for uspace/app/inet/inet.c

Timestamp:

2012-05-17T21:09:06Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8fde078

Parents:

a8b8086 (diff), 3e67ab1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• uspace/app/inet/inet.c (moved) (moved from uspace/app/inetcfg/inetcfg.c ) (6 diffs)

uspace/app/inet/inet.c

@@ -27 +27 @@
  */
 
-/** @addtogroup inetcfg
+/** @addtogroup inet
  * @{
  */
@@ -35 +35 @@
  */
 
-#include <async.h>
 #include <errno.h>
 #include <inet/inetcfg.h>
@@ -44 +43 @@
 #include <sys/types.h>
 
-#define NAME "inetcfg"
+#define NAME "inet"
 
 static void print_syntax(void)
@@ -188 +187 @@
         rc = inetcfg_addr_create_static(aobj_name, &naddr, link_id, &addr_id);
         if (rc != EOK) {
-                printf(NAME ": Failed creating static address '%s' (%d)\n",
-                    aobj_name, rc);
+                printf(NAME ": Failed creating static address '%s' (%s)\n",
+                    aobj_name, str_error(rc));
                 return EIO;
         }
@@ -346 +345 @@
 
         printf("Configured addresses:\n");
-
+        if (count > 0)
+                printf("    [Addr/Width] [Link-Name] [Addr-Name] [Def-MTU]\n");
         ainfo.name = linfo.name = astr = NULL;
 
@@ -416 +416 @@
 
         printf("Static routes:\n");
+        if (count > 0)
+                printf("    [Dest/Width] [Router-Addr] [Route-Name]\n");
 
         srinfo.name = dest_str = router_str = NULL;