Changes in uspace/app/trace/trace.c [f43742e2:706b4de] in mainline

File:

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

uspace/app/trace/trace.c

@@ -38 +38 @@
 #include <stdint.h>
 #include <stddef.h>
-#include <str_error.h>
 #include <inttypes.h>
 #include <fibril.h>
@@ -63 +62 @@
 #include "syscalls.h"
 #include "ipcp.h"
+#include "errors.h"
 #include "trace.h"
 
@@ -157 +157 @@
                 
                 printf("Error connecting\n");
-                printf("ipc_connect_task(%" PRIu64 ") -> %s ", task_id, str_error_name(errno));
+                printf("ipc_connect_task(%" PRIu64 ") -> %d ", task_id, errno);
                 return errno;
         }
@@ -163 +163 @@
         int rc = udebug_begin(ksess);
         if (rc < 0) {
-                printf("udebug_begin() -> %s\n", str_error_name(rc));
+                printf("udebug_begin() -> %d\n", rc);
                 return rc;
         }
@@ -169 +169 @@
         rc = udebug_set_evmask(ksess, UDEBUG_EM_ALL);
         if (rc < 0) {
-                printf("udebug_set_evmask(0x%x) -> %s\n ", UDEBUG_EM_ALL, str_error_name(rc));
+                printf("udebug_set_evmask(0x%x) -> %d\n ", UDEBUG_EM_ALL, rc);
                 return rc;
         }
@@ -187 +187 @@
                 THBUF_SIZE*sizeof(unsigned), &tb_copied, &tb_needed);
         if (rc < 0) {
-                printf("udebug_thread_read() -> %s\n", str_error_name(rc));
+                printf("udebug_thread_read() -> %d\n", rc);
                 return rc;
         }
@@ -225 +225 @@
                 if (sval >= -15 && sval <= 0) {
                         printf("%ld %s (%s)", sval,
-                            str_error_name((int) sval),
-                            str_error((int) sval));
+                            err_desc[-sval].name,
+                            err_desc[-sval].desc);
                 } else {
                         printf("%ld", sval);
@@ -234 +234 @@
                 if (sval >= -15 && sval < 0) {
                         printf("%ld %s (%s)", sval,
-                            str_error_name((int) sval),
-                            str_error((int) sval));
+                            err_desc[-sval].name,
+                            err_desc[-sval].desc);
                 } else {
                         printf("%ld", sval);
@@ -284 +284 @@
         sysarg_t phoneid;
         
-        if (sc_rc != (sysarg_t) EOK)
+        if (sc_rc == (sysarg_t) IPC_CALLRET_FATAL)
                 return;
 
@@ -304 +304 @@
         int rc;
 
-        if (sc_rc != (sysarg_t) EOK)
+        if (sc_rc == (sysarg_t) IPC_CALLRET_FATAL)
                 return;
 
@@ -604 +604 @@
         rc = get_thread_list();
         if (rc < 0) {
-                printf("Failed to get thread list (%s)\n", str_error(rc));
+                printf("Failed to get thread list (error %d)\n", rc);
                 return;
         }
@@ -643 +643 @@
                         rc = udebug_stop(sess, thash);
                         if (rc != EOK)
-                                printf("Error: stop -> %s\n", str_error_name(rc));
+                                printf("Error: stop -> %d\n", rc);
                         break;
                 case KC_R: