Changeset d5c1051 in mainline for uspace/app/taskdump/taskdump.c

Timestamp:

2017-12-20T22:25:34Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

39b54fe

Parents:

8610c2c

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-20 22:22:29)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-20 22:25:34)

Message:

"Obviously harmless" error handling tweaks.

File:

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

uspace/app/taskdump/taskdump.c

@@ -92 +92 @@
 
         rc = connect_task(task_id);
-        if (rc < 0) {
+        if (rc != EOK) {
                 printf("Failed connecting to task %" PRIu64 ".\n", task_id);
                 return 1;
@@ -105 +105 @@
 
         rc = threads_dump();
-        if (rc < 0)
+        if (rc != EOK)
                 printf("Failed dumping threads.\n");
 
         rc = areas_dump();
-        if (rc < 0)
+        if (rc != EOK)
                 printf("Failed dumping address space areas.\n");
 
         rc = fibrils_dump(app_symtab, sess);
-        if (rc < 0)
+        if (rc != EOK)
                 printf("Failed dumping fibrils.\n");
 
@@ -141 +141 @@
         
         int rc = udebug_begin(ksess);
-        if (rc < 0) {
+        if (rc != EOK) {
                 printf("udebug_begin() -> %s\n", str_error_name(rc));
                 return rc;
@@ -223 +223 @@
         /* TODO: See why NULL does not work. */
         rc = udebug_thread_read(sess, &dummy_buf, 0, &copied, &needed);
-        if (rc < 0) {
+        if (rc != EOK) {
                 printf("udebug_thread_read() -> %s\n", str_error_name(rc));
                 return rc;
@@ -237 +237 @@
 
         rc = udebug_thread_read(sess, thash_buf, buf_size, &copied, &needed);
-        if (rc < 0) {
+        if (rc != EOK) {
                 printf("udebug_thread_read() -> %s\n", str_error_name(rc));
                 return rc;
@@ -272 +272 @@
 
         rc = udebug_areas_read(sess, &dummy_buf, 0, &copied, &needed);
-        if (rc < 0) {
+        if (rc != EOK) {
                 printf("udebug_areas_read() -> %s\n", str_error_name(rc));
                 return rc;
@@ -281 +281 @@
 
         rc = udebug_areas_read(sess, ainfo_buf, buf_size, &copied, &needed);
-        if (rc < 0) {
+        if (rc != EOK) {
                 printf("udebug_areas_read() -> %s\n", str_error_name(rc));
                 return rc;
@@ -357 +357 @@
 
         rc = udebug_regs_read(sess, thash, &istate);
-        if (rc < 0) {
+        if (rc != EOK) {
                 printf("Failed reading registers: %s.\n", str_error_name(rc));
                 return EIO;
@@ -386 +386 @@
 
         rc = udebug_mem_read(sess, &data, addr, sizeof(data));
-        if (rc < 0) {
+        if (rc != EOK) {
                 printf("Warning: udebug_mem_read() failed.\n");
                 return rc;
@@ -400 +400 @@
         char *file_name;
         int rc;
+        int ret;
 
         assert(app_name != NULL);
         assert(app_symtab == NULL);
 
-        rc = asprintf(&file_name, "/app/%s", app_name);
-        if (rc < 0) {
+        ret = asprintf(&file_name, "/app/%s", app_name);
+        if (ret < 0) {
                 printf("Memory allocation failure.\n");
                 exit(1);
@@ -419 +420 @@
         free(file_name);
 
-        rc = asprintf(&file_name, "/srv/%s", app_name);
-        if (rc < 0) {
+        ret = asprintf(&file_name, "/srv/%s", app_name);
+        if (ret < 0) {
                 printf("Memory allocation failure.\n");
                 exit(1);
@@ -432 +433 @@
         }
 
-        rc = asprintf(&file_name, "/drv/%s/%s", app_name, app_name);
-        if (rc < 0) {
+        ret = asprintf(&file_name, "/drv/%s/%s", app_name, app_name);
+        if (ret < 0) {
                 printf("Memory allocation failure.\n");
                 exit(1);
@@ -457 +458 @@
 
         rc = udebug_name_read(sess, &dummy_buf, 0, &copied, &needed);
-        if (rc < 0)
+        if (rc != EOK)
                 return NULL;
 
@@ -463 +464 @@
         name = malloc(name_size + 1);
         rc = udebug_name_read(sess, name, name_size, &copied, &needed);
-        if (rc < 0) {
+        if (rc != EOK) {
                 free(name);
                 return NULL;
@@ -488 +489 @@
         size_t offs;
         int rc;
+        int ret;
         char *str;
 
@@ -497 +499 @@
 
         if (rc == EOK) {
-                rc = asprintf(&str, "%p (%s+%zu)", (void *) addr, name, offs);
+                ret = asprintf(&str, "%p (%s+%zu)", (void *) addr, name, offs);
         } else {
-                rc = asprintf(&str, "%p", (void *) addr);
-        }
-
-        if (rc < 0) {
+                ret = asprintf(&str, "%p", (void *) addr);
+        }
+
+        if (ret < 0) {
                 printf("Memory allocation error.\n");
                 exit(1);