Changeset 132ab5d1 in mainline for uspace/app/taskdump/elf_core.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/app/taskdump/elf_core.c (modified) (10 diffs)

uspace/app/taskdump/elf_core.c

@@ -55 +55 @@
 #include <stddef.h>
 #include <errno.h>
+#include <str_error.h>
 #include <mem.h>
 #include <as.h>
@@ -97 +98 @@
 
         int fd;
-        ssize_t rc;
+        int rc;
+        size_t nwr;
         unsigned int i;
 
@@ -122 +124 @@
         }
 
-        fd = vfs_lookup_open(file_name, WALK_REGULAR | WALK_MAY_CREATE,
-            MODE_WRITE);
-        if (fd < 0) {
-                printf("Failed opening file.\n");
+        rc = vfs_lookup_open(file_name, WALK_REGULAR | WALK_MAY_CREATE,
+            MODE_WRITE, &fd);
+        if (rc != EOK) {
+                printf("Failed opening file '%s': %s.\n", file_name, str_error(rc));
                 free(p_hdr);
                 return ENOENT;
@@ -206 +208 @@
         }
 
-        rc = vfs_write(fd, &pos, &elf_hdr, sizeof(elf_hdr));
-        if (rc != sizeof(elf_hdr)) {
+        rc = vfs_write(fd, &pos, &elf_hdr, sizeof(elf_hdr), &nwr);
+        if (rc != EOK) {
                 printf("Failed writing ELF header.\n");
                 free(p_hdr);
@@ -214 +216 @@
 
         for (i = 0; i < n_ph; ++i) {
-                rc = vfs_write(fd, &pos, &p_hdr[i], sizeof(p_hdr[i]));
-                if (rc != sizeof(p_hdr[i])) {
+                rc = vfs_write(fd, &pos, &p_hdr[i], sizeof(p_hdr[i]), &nwr);
+                if (rc != EOK) {
                         printf("Failed writing program header.\n");
                         free(p_hdr);
@@ -231 +233 @@
         note.type = NT_PRSTATUS;
 
-        rc = vfs_write(fd, &pos, &note, sizeof(elf_note_t));
-        if (rc != sizeof(elf_note_t)) {
+        rc = vfs_write(fd, &pos, &note, sizeof(elf_note_t), &nwr);
+        if (rc != EOK) {
                 printf("Failed writing note header.\n");
                 free(p_hdr);
@@ -238 +240 @@
         }
 
-        rc = vfs_write(fd, &pos, "CORE", note.namesz);
-        if (rc != (ssize_t) note.namesz) {
+        rc = vfs_write(fd, &pos, "CORE", note.namesz, &nwr);
+        if (rc != EOK) {
                 printf("Failed writing note header.\n");
                 free(p_hdr);
@@ -247 +249 @@
         pos = ALIGN_UP(pos, word_size);
 
-        rc = vfs_write(fd, &pos, &pr_status, sizeof(elf_prstatus_t));
-        if (rc != sizeof(elf_prstatus_t)) {
+        rc = vfs_write(fd, &pos, &pr_status, sizeof(elf_prstatus_t), &nwr);
+        if (rc != EOK) {
                 printf("Failed writing register data.\n");
                 free(p_hdr);
@@ -296 +298 @@
         size_t total;
         uintptr_t addr;
-        ssize_t rc;
+        int rc;
+        size_t nwr;
 
         addr = area->start_addr;
@@ -304 +307 @@
                 to_copy = min(area->size - total, BUFFER_SIZE);
                 rc = udebug_mem_read(sess, buffer, addr, to_copy);
-                if (rc < 0) {
+                if (rc != EOK) {
                         printf("Failed reading task memory.\n");
                         return EIO;
                 }
 
-                rc = vfs_write(fd, pos, buffer, to_copy);
-                if (rc != (ssize_t) to_copy) {
+                rc = vfs_write(fd, pos, buffer, to_copy, &nwr);
+                if (rc != EOK) {
                         printf("Failed writing memory contents.\n");
                         return EIO;