Changeset 8e3498b in mainline for uspace/app/taskdump

Timestamp:

2017-12-04T18:44:24Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bde5c04

Parents:

40feeac

Message:

vfs_read/write() should return error code separately from number of bytes transferred.

Location:

uspace/app/taskdump

Files:

• elf_core.c (modified) (8 diffs)
• symtab.c (modified) (5 diffs)

uspace/app/taskdump/elf_core.c

@@ -97 +97 @@
 
         int fd;
-        ssize_t rc;
+        int rc;
+        size_t nwr;
         unsigned int i;
 
@@ -206 +207 @@
         }
 
-        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 +215 @@
 
         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 +232 @@
         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 +239 @@
         }
 
-        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 +248 @@
         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 +297 @@
         size_t total;
         uintptr_t addr;
-        ssize_t rc;
+        int rc;
+        size_t nwr;
 
         addr = area->start_addr;
@@ -309 +311 @@
                 }
 
-                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;

uspace/app/taskdump/symtab.c

@@ -71 +71 @@
         int fd;
         int rc;
+        size_t nread;
         int i;
 
@@ -88 +89 @@
         }
 
-        rc = vfs_read(fd, &pos, &elf_hdr, sizeof(elf_header_t));
-        if (rc != sizeof(elf_header_t)) {
+        rc = vfs_read(fd, &pos, &elf_hdr, sizeof(elf_header_t), &nread);
+        if (rc != EOK || nread != sizeof(elf_header_t)) {
                 printf("failed reading elf header\n");
                 free(stab);
@@ -304 +305 @@
 {
         int rc;
+        size_t nread;
         aoff64_t pos = elf_hdr->e_shoff + idx * sizeof(elf_section_header_t);
 
-        rc = vfs_read(fd, &pos, sec_hdr, sizeof(elf_section_header_t));
-        if (rc != sizeof(elf_section_header_t))
+        rc = vfs_read(fd, &pos, sec_hdr, sizeof(elf_section_header_t), &nread);
+        if (rc != EOK || nread != sizeof(elf_section_header_t))
                 return EIO;
 
@@ -326 +328 @@
 static int chunk_load(int fd, off64_t start, size_t size, void **ptr)
 {
-        ssize_t rc;
+        int rc;
+        size_t nread;
         aoff64_t pos = start;
 
@@ -335 +338 @@
         }
 
-        rc = vfs_read(fd, &pos, *ptr, size);
-        if (rc != (ssize_t) size) {
+        rc = vfs_read(fd, &pos, *ptr, size, &nread);
+        if (rc != EOK || nread != size) {
                 printf("failed reading chunk\n");
                 free(*ptr);