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

uspace/srv/net/dhcp/dhcp.c

@@ -39 +39 @@
 #include <byteorder.h>
 #include <errno.h>
+#include <str_error.h>
 #include <fibril_synch.h>
 #include <inet/addr.h>
@@ -370 +371 @@
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR,
-                    "Error creating IP address %s (%d)", "dhcp4a", rc);
+                    "Error creating IP address %s: %s", "dhcp4a", str_error(rc));
                 return rc;
         }
@@ -380 +381 @@
                 if (rc != EOK) {
                         log_msg(LOG_DEFAULT, LVL_ERROR, "Error creating "
-                            "default route %s (%d).", "dhcpdef", rc);
+                            "default route %s: %s.", "dhcpdef", str_error(rc));
                         return rc;
                 }
@@ -389 +390 @@
                 if (rc != EOK) {
                         log_msg(LOG_DEFAULT, LVL_ERROR, "Error setting "
-                            "nameserver address (%d))", rc);
+                            "nameserver address: %s)", str_error(rc));
                         return rc;
                 }