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

uspace/srv/taskmon/taskmon.c

@@ -51 +51 @@
 static void corecfg_client_conn(ipc_callid_t , ipc_call_t *, void *);
 
-static void fault_event(ipc_callid_t callid, ipc_call_t *call, void *arg)
+static void fault_event(ipc_call_t *call, void *arg)
 {
         const char *fname;
@@ -150 +150 @@
         int rc = loc_server_register(NAME);
         if (rc != EOK) {
-                printf("%s: Failed registering server (%d).\n",
-                    NAME, rc);
+                printf("%s: Failed registering server: %s.\n",
+                    NAME, str_error(rc));
                 return -1;
         }
@@ -158 +158 @@
         rc = loc_service_register(SERVICE_NAME_CORECFG, &sid);
         if (rc != EOK) {
-                printf("%s: Failed registering service (%d).\n",
-                    NAME, rc);
+                printf("%s: Failed registering service: %s.\n",
+                    NAME, str_error(rc));
                 return -1;
         }