Changes in uspace/app/taskdump/taskdump.c [d5c1051:7354b5e] in mainline

File:

• uspace/app/taskdump/taskdump.c (modified) (17 diffs)

uspace/app/taskdump/taskdump.c

@@ -40 +40 @@
 #include <stddef.h>
 #include <stdbool.h>
-#include <str_error.h>
 #include <errno.h>
 #include <udebug.h>
@@ -92 +91 @@
 
         rc = connect_task(task_id);
-        if (rc != EOK) {
+        if (rc < 0) {
                 printf("Failed connecting to task %" PRIu64 ".\n", task_id);
                 return 1;
@@ -105 +104 @@
 
         rc = threads_dump();
-        if (rc != EOK)
+        if (rc < 0)
                 printf("Failed dumping threads.\n");
 
         rc = areas_dump();
-        if (rc != EOK)
+        if (rc < 0)
                 printf("Failed dumping address space areas.\n");
 
         rc = fibrils_dump(app_symtab, sess);
-        if (rc != EOK)
+        if (rc < 0)
                 printf("Failed dumping fibrils.\n");
 
@@ -136 +135 @@
                 
                 printf("Error connecting\n");
-                printf("async_connect_kbox(%" PRIu64 ") -> %s", task_id, str_error_name(errno));
+                printf("async_connect_kbox(%" PRIu64 ") -> %d ", task_id, errno);
                 return errno;
         }
         
         int rc = udebug_begin(ksess);
-        if (rc != EOK) {
-                printf("udebug_begin() -> %s\n", str_error_name(rc));
+        if (rc < 0) {
+                printf("udebug_begin() -> %d\n", rc);
                 return rc;
         }
@@ -223 +222 @@
         /* TODO: See why NULL does not work. */
         rc = udebug_thread_read(sess, &dummy_buf, 0, &copied, &needed);
-        if (rc != EOK) {
-                printf("udebug_thread_read() -> %s\n", str_error_name(rc));
+        if (rc < 0) {
+                printf("udebug_thread_read() -> %d\n", rc);
                 return rc;
         }
@@ -237 +236 @@
 
         rc = udebug_thread_read(sess, thash_buf, buf_size, &copied, &needed);
-        if (rc != EOK) {
-                printf("udebug_thread_read() -> %s\n", str_error_name(rc));
+        if (rc < 0) {
+                printf("udebug_thread_read() -> %d\n", rc);
                 return rc;
         }
@@ -272 +271 @@
 
         rc = udebug_areas_read(sess, &dummy_buf, 0, &copied, &needed);
-        if (rc != EOK) {
-                printf("udebug_areas_read() -> %s\n", str_error_name(rc));
+        if (rc < 0) {
+                printf("udebug_areas_read() -> %d\n", rc);
                 return rc;
         }
@@ -281 +280 @@
 
         rc = udebug_areas_read(sess, ainfo_buf, buf_size, &copied, &needed);
-        if (rc != EOK) {
-                printf("udebug_areas_read() -> %s\n", str_error_name(rc));
+        if (rc < 0) {
+                printf("udebug_areas_read() -> %d\n", rc);
                 return rc;
         }
@@ -357 +356 @@
 
         rc = udebug_regs_read(sess, thash, &istate);
-        if (rc != EOK) {
-                printf("Failed reading registers: %s.\n", str_error_name(rc));
+        if (rc < 0) {
+                printf("Failed reading registers (%d).\n", rc);
                 return EIO;
         }
@@ -386 +385 @@
 
         rc = udebug_mem_read(sess, &data, addr, sizeof(data));
-        if (rc != EOK) {
+        if (rc < 0) {
                 printf("Warning: udebug_mem_read() failed.\n");
                 return rc;
@@ -400 +399 @@
         char *file_name;
         int rc;
-        int ret;
 
         assert(app_name != NULL);
         assert(app_symtab == NULL);
 
-        ret = asprintf(&file_name, "/app/%s", app_name);
-        if (ret < 0) {
+        rc = asprintf(&file_name, "/app/%s", app_name);
+        if (rc < 0) {
                 printf("Memory allocation failure.\n");
                 exit(1);
@@ -420 +418 @@
         free(file_name);
 
-        ret = asprintf(&file_name, "/srv/%s", app_name);
-        if (ret < 0) {
+        rc = asprintf(&file_name, "/srv/%s", app_name);
+        if (rc < 0) {
                 printf("Memory allocation failure.\n");
                 exit(1);
@@ -433 +431 @@
         }
 
-        ret = asprintf(&file_name, "/drv/%s/%s", app_name, app_name);
-        if (ret < 0) {
+        rc = asprintf(&file_name, "/drv/%s/%s", app_name, app_name);
+        if (rc < 0) {
                 printf("Memory allocation failure.\n");
                 exit(1);
@@ -458 +456 @@
 
         rc = udebug_name_read(sess, &dummy_buf, 0, &copied, &needed);
-        if (rc != EOK)
+        if (rc < 0)
                 return NULL;
 
@@ -464 +462 @@
         name = malloc(name_size + 1);
         rc = udebug_name_read(sess, name, name_size, &copied, &needed);
-        if (rc != EOK) {
+        if (rc < 0) {
                 free(name);
                 return NULL;
@@ -489 +487 @@
         size_t offs;
         int rc;
-        int ret;
         char *str;
 
@@ -499 +496 @@
 
         if (rc == EOK) {
-                ret = asprintf(&str, "%p (%s+%zu)", (void *) addr, name, offs);
+                rc = asprintf(&str, "%p (%s+%zu)", (void *) addr, name, offs);
         } else {
-                ret = asprintf(&str, "%p", (void *) addr);
-        }
-
-        if (ret < 0) {
+                rc = asprintf(&str, "%p", (void *) addr);
+        }
+
+        if (rc < 0) {
                 printf("Memory allocation error.\n");
                 exit(1);