Changeset 1569a9b in mainline for uspace/app/trace/trace.c

Timestamp:

2017-12-24T16:40:33Z (6 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

48fd597

Parents:

a1026da

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-24 16:40:33)

git-committer:

GitHub <noreply@…> (2017-12-24 16:40:33)

Message:

The "not-so-obvious" error handling tweaks. (#9)

Some more changes to enable type-checking with errno_t. Some of the "fixes" here don't quite feel right, but a proper solution would be a more elaborate refactoring of the surrounding code.

File:

• uspace/app/trace/trace.c (modified) (4 diffs)

uspace/app/trace/trace.c

@@ -260 +260 @@
 
 
-static void print_sc_retval(int retval, val_type_t val_type)
+static void print_sc_retval(sysarg_t retval, val_type_t val_type)
 {
         printf(" -> ");
@@ -296 +296 @@
         IPC_SET_ARG5(call, 0);
 
-        ipcp_call_out(phoneid, &call, sc_rc);
-}
-
-static void sc_ipc_call_async_slow(sysarg_t *sc_args, sysarg_t sc_rc)
+        ipcp_call_out(phoneid, &call, 0);
+}
+
+static void sc_ipc_call_async_slow(sysarg_t *sc_args, int sc_rc)
 {
         ipc_call_t call;
         int rc;
 
-        if (sc_rc != (sysarg_t) EOK)
+        if (sc_rc != EOK)
                 return;
 
@@ -310 +310 @@
         rc = udebug_mem_read(sess, &call.args, sc_args[1], sizeof(call.args));
 
-        if (rc >= 0) {
-                ipcp_call_out(sc_args[0], &call, sc_rc);
+        if (rc == EOK) {
+                ipcp_call_out(sc_args[0], &call, 0);
         }
 }
@@ -581 +581 @@
                 
                 if (!console_get_event(console, &event))
-                        return -1;
+                        return EINVAL;
                 
                 if (event.type == CEV_KEY) {