Changeset 8e3498b in mainline for uspace/app/taskdump/symtab.c

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.

File:

• uspace/app/taskdump/symtab.c (modified) (5 diffs)

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);