Changeset 132ab5d1 in mainline for uspace/app/inet/inet.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

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

uspace/app/inet/inet.c

@@ -89 +89 @@
         rc = loc_service_get_id(link_name, &link_id, 0);
         if (rc != EOK) {
-                printf(NAME ": Service '%s' not found (%d).\n", link_name, rc);
+                printf(NAME ": Service '%s' not found: %s.\n", link_name, str_error(rc));
                 return ENOENT;
         }
@@ -135 +135 @@
         rc = loc_service_get_id(link_name, &link_id, 0);
         if (rc != EOK) {
-                printf(NAME ": Service '%s' not found (%d).\n", link_name, rc);
+                printf(NAME ": Service '%s' not found: %s.\n", link_name,
+                    str_error(rc));
                 return ENOENT;
         }
@@ -141 +142 @@
         rc = inetcfg_addr_get_id(aobj_name, link_id, &addr_id);
         if (rc != EOK) {
-                printf(NAME ": Address '%s' not found (%d).\n", aobj_name, rc);
+                printf(NAME ": Address '%s' not found: %s.\n", aobj_name,
+                    str_error(rc));
                 return ENOENT;
         }
@@ -147 +149 @@
         rc = inetcfg_addr_delete(addr_id);
         if (rc != EOK) {
-                printf(NAME ": Failed deleting address '%s' (%d)\n", aobj_name,
-                    rc);
+                printf(NAME ": Failed deleting address '%s': %s\n", aobj_name,
+                    str_error(rc));
                 return EIO;
         }
@@ -197 +199 @@
         rc = inetcfg_sroute_create(route_name, &dest, &router, &sroute_id);
         if (rc != EOK) {
-                printf(NAME ": Failed creating static route '%s' (%d)\n",
-                    route_name, rc);
+                printf(NAME ": Failed creating static route '%s': %s\n",
+                    route_name, str_error(rc));
                 return EIO;
         }
@@ -227 +229 @@
         rc = inetcfg_sroute_get_id(route_name, &sroute_id);
         if (rc != EOK) {
-                printf(NAME ": Static route '%s' not found (%d).\n",
-                    route_name, rc);
+                printf(NAME ": Static route '%s' not found: %s.\n",
+                    route_name, str_error(rc));
                 return ENOENT;
         }
@@ -234 +236 @@
         rc = inetcfg_sroute_delete(sroute_id);
         if (rc != EOK) {
-                printf(NAME ": Failed deleting static route '%s' (%d)\n",
-                    route_name, rc);
+                printf(NAME ": Failed deleting static route '%s': %s\n",
+                    route_name, str_error(rc));
                 return EIO;
         }
@@ -486 +488 @@
         rc = inetcfg_init();
         if (rc != EOK) {
-                printf(NAME ": Failed connecting to internet service (%d).\n",
-                    rc);
+                printf(NAME ": Failed connecting to internet service: %s.\n",
+                    str_error(rc));
                 return 1;
         }