Changes in uspace/app/trace/trace.c [a53ed3a:1569a9b] in mainline

File:

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

uspace/app/trace/trace.c

@@ -93 +93 @@
 display_mask_t display_mask;
 
-static errno_t program_run_fibril(void *arg);
-static errno_t cev_fibril(void *arg);
+static int program_run_fibril(void *arg);
+static int cev_fibril(void *arg);
 
 static void program_run(void)
@@ -122 +122 @@
 }
 
-static errno_t program_run_fibril(void *arg)
-{
-        errno_t rc;
+static int program_run_fibril(void *arg)
+{
+        int rc;
 
         /*
@@ -131 +131 @@
          */
         rc = loader_run(task_ldr);
-        if (rc != EOK) {
+        if (rc != 0) {
                 printf("Error running program\n");
                 exit(1);
@@ -143 +143 @@
 
 
-static errno_t connect_task(task_id_t task_id)
+static int connect_task(task_id_t task_id)
 {
         async_sess_t *ksess = async_connect_kbox(task_id);
@@ -161 +161 @@
         }
         
-        errno_t rc = udebug_begin(ksess);
+        int rc = udebug_begin(ksess);
         if (rc != EOK) {
                 printf("udebug_begin() -> %s\n", str_error_name(rc));
@@ -177 +177 @@
 }
 
-static errno_t get_thread_list(void)
-{
-        errno_t rc;
+static int get_thread_list(void)
+{
+        int rc;
         size_t tb_copied;
         size_t tb_needed;
@@ -225 +225 @@
                 if (sval >= -15 && sval <= 0) {
                         printf("%ld %s (%s)", sval,
-                            str_error_name((errno_t) sval),
-                            str_error((errno_t) sval));
+                            str_error_name((int) sval),
+                            str_error((int) sval));
                 } else {
                         printf("%ld", sval);
@@ -234 +234 @@
                 if (sval >= -15 && sval < 0) {
                         printf("%ld %s (%s)", sval,
-                            str_error_name((errno_t) sval),
-                            str_error((errno_t) sval));
+                            str_error_name((int) sval),
+                            str_error((int) sval));
                 } else {
                         printf("%ld", sval);
@@ -279 +279 @@
 }
 
-static void sc_ipc_call_async_fast(sysarg_t *sc_args, errno_t sc_rc)
+static void sc_ipc_call_async_fast(sysarg_t *sc_args, int sc_rc)
 {
         ipc_call_t call;
@@ -299 +299 @@
 }
 
-static void sc_ipc_call_async_slow(sysarg_t *sc_args, errno_t sc_rc)
+static void sc_ipc_call_async_slow(sysarg_t *sc_args, int sc_rc)
 {
         ipc_call_t call;
-        errno_t rc;
+        int rc;
 
         if (sc_rc != EOK)
@@ -318 +318 @@
 {
         ipc_call_t call;
-        errno_t rc;
+        int rc;
 
         if (sc_rc == 0) return;
@@ -333 +333 @@
 {
         sysarg_t sc_args[6];
-        errno_t rc;
+        int rc;
 
         /* Read syscall arguments */
@@ -361 +361 @@
         sysarg_t sc_args[6];
         int rv_type;
-        errno_t rc;
+        int rc;
 
         /* Read syscall arguments */
@@ -384 +384 @@
         switch (sc_id) {
         case SYS_IPC_CALL_ASYNC_FAST:
-                sc_ipc_call_async_fast(sc_args, (errno_t) sc_rc);
+                sc_ipc_call_async_fast(sc_args, sc_rc);
                 break;
         case SYS_IPC_CALL_ASYNC_SLOW:
-                sc_ipc_call_async_slow(sc_args, (errno_t) sc_rc);
+                sc_ipc_call_async_slow(sc_args, sc_rc);
                 break;
         case SYS_IPC_WAIT:
@@ -403 +403 @@
 }
 
-static errno_t trace_loop(void *thread_hash_arg)
-{
-        errno_t rc;
+static int trace_loop(void *thread_hash_arg)
+{
+        int rc;
         unsigned ev_type;
         uintptr_t thread_hash;
@@ -498 +498 @@
 {
         loader_t *ldr;
-        errno_t rc;
+        int rc;
 
         /* Spawn a program loader */
@@ -566 +566 @@
 }
 
-static errno_t cev_fibril(void *arg)
+static int cev_fibril(void *arg)
 {
         cons_event_t event;
@@ -598 +598 @@
         bool done;
         int i;
-        errno_t rc;
+        int rc;
 
         ipcp_init();
@@ -844 +844 @@
 int main(int argc, char *argv[])
 {
-        errno_t rc;
+        int rc;
         task_exit_t texit;
         int retval;