Changes in uspace/app/taskdump/symtab.c [125c09c:8d2dd7f2] in mainline

File:

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

uspace/app/taskdump/symtab.c

@@ -41 +41 @@
 #include <stddef.h>
 #include <errno.h>
-#include <str_error.h>
 #include <vfs/vfs.h>
 
@@ -72 +71 @@
         int fd;
         int rc;
-        size_t nread;
         int i;
 
@@ -83 +81 @@
                 return ENOMEM;
 
-        rc = vfs_lookup_open(file_name, WALK_REGULAR, MODE_READ, &fd);
-        if (rc != EOK) {
-                printf("failed opening file '%s': %s\n", file_name, str_error(rc));
+        fd = vfs_lookup_open(file_name, WALK_REGULAR, MODE_READ);
+        if (fd < 0) {
+                printf("failed opening file\n");
                 free(stab);
                 return ENOENT;
         }
 
-        rc = vfs_read(fd, &pos, &elf_hdr, sizeof(elf_header_t), &nread);
-        if (rc != EOK || nread != sizeof(elf_header_t)) {
+        rc = vfs_read(fd, &pos, &elf_hdr, sizeof(elf_header_t));
+        if (rc != sizeof(elf_header_t)) {
                 printf("failed reading elf header\n");
                 free(stab);
@@ -306 +304 @@
 {
         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), &nread);
-        if (rc != EOK || nread != sizeof(elf_section_header_t))
+        rc = vfs_read(fd, &pos, sec_hdr, sizeof(elf_section_header_t));
+        if (rc != sizeof(elf_section_header_t))
                 return EIO;
 
@@ -329 +326 @@
 static int chunk_load(int fd, off64_t start, size_t size, void **ptr)
 {
-        int rc;
-        size_t nread;
+        ssize_t rc;
         aoff64_t pos = start;
 
@@ -339 +335 @@
         }
 
-        rc = vfs_read(fd, &pos, *ptr, size, &nread);
-        if (rc != EOK || nread != size) {
+        rc = vfs_read(fd, &pos, *ptr, size);
+        if (rc != (ssize_t) size) {
                 printf("failed reading chunk\n");
                 free(*ptr);