Changeset 132ab5d1 in mainline for uspace/app/taskdump/symtab.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/symtab.c (modified) (7 diffs)

uspace/app/taskdump/symtab.c

@@ -41 +41 @@
 #include <stddef.h>
 #include <errno.h>
+#include <str_error.h>
 #include <vfs/vfs.h>
 
@@ -71 +72 @@
         int fd;
         int rc;
+        size_t nread;
         int i;
 
@@ -81 +83 @@
                 return ENOMEM;
 
-        fd = vfs_lookup_open(file_name, WALK_REGULAR, MODE_READ);
-        if (fd < 0) {
-                printf("failed opening file\n");
+        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));
                 free(stab);
                 return ENOENT;
         }
 
-        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);
@@ -283 +285 @@
 /** Check if ELF header is valid.
  *
- * @return      EOK on success or negative error code.
+ * @return      EOK on success or an error code.
  */
 static int elf_hdr_check(elf_header_t *ehdr)
@@ -304 +306 @@
 {
         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 +329 @@
 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 +339 @@
         }
 
-        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);