Changeset 132ab5d1 in mainline for uspace/srv/net/loopip/loopip.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/srv/net/loopip/loopip.c (modified) (2 diffs)

uspace/srv/net/loopip/loopip.c

@@ -38 +38 @@
 #include <async.h>
 #include <errno.h>
+#include <str_error.h>
 #include <inet/iplink_srv.h>
 #include <inet/addr.h>
@@ -251 +252 @@
         int rc = log_init(NAME);
         if (rc != EOK) {
-                printf("%s: Failed to initialize logging.\n", NAME);
+                printf("%s: Failed to initialize logging: %s.\n", NAME, str_error(rc));
                 return rc;
         }
         
         rc = loopip_init();
-        if (rc != EOK)
-                return rc;
+        if (rc != EOK) {
+                printf("%s: Failed to initialize loopip: %s.\n", NAME, str_error(rc));
+                return rc;
+        }
         
         printf("%s: Accepting connections.\n", NAME);