Changes in uspace/app/taskdump/symtab.c [8e3498b:1d6dd2a] in mainline

File:

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

uspace/app/taskdump/symtab.c

@@ -41 +41 @@
 #include <stddef.h>
 #include <errno.h>
+#include <str.h>
+#include <str_error.h>
 #include <vfs/vfs.h>
 
 #include "include/symtab.h"
 
-static int elf_hdr_check(elf_header_t *hdr);
-static int section_hdr_load(int fd, const elf_header_t *ehdr, int idx,
+static errno_t elf_hdr_check(elf_header_t *hdr);
+static errno_t section_hdr_load(int fd, const elf_header_t *ehdr, int idx,
     elf_section_header_t *shdr);
-static int chunk_load(int fd, off64_t start, size_t size, void **ptr);
+static errno_t chunk_load(int fd, off64_t start, size_t size, void **ptr);
 
 /** Load symbol table from an ELF file.
@@ -58 +60 @@
  *                      ENOTSUP if file parsing failed.
  */
-int symtab_load(const char *file_name, symtab_t **symtab)
+errno_t symtab_load(const char *file_name, symtab_t **symtab)
 {
         symtab_t *stab;
@@ -70 +72 @@
 
         int fd;
-        int rc;
+        errno_t rc;
         size_t nread;
         int i;
@@ -82 +84 @@
                 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;
@@ -203 +205 @@
  * @return      EOK on success, ENOENT if no such symbol was found.
  */
-int symtab_name_to_addr(symtab_t *st, const char *name, uintptr_t *addr)
+errno_t symtab_name_to_addr(symtab_t *st, const char *name, uintptr_t *addr)
 {
         size_t i;
@@ -240 +242 @@
  * @return      EOK on success or ENOENT if no matching symbol was found.
  */
-int symtab_addr_to_name(symtab_t *st, uintptr_t addr, char **name,
+errno_t symtab_addr_to_name(symtab_t *st, uintptr_t addr, char **name,
     size_t *offs)
 {
@@ -284 +286 @@
 /** Check if ELF header is valid.
  *
- * @return      EOK on success or negative error code.
- */
-static int elf_hdr_check(elf_header_t *ehdr)
+ * @return      EOK on success or an error code.
+ */
+static errno_t elf_hdr_check(elf_header_t *ehdr)
 {
         /* TODO */
@@ -301 +303 @@
  * @return              EOK on success or EIO if I/O failed.
  */
-static int section_hdr_load(int fd, const elf_header_t *elf_hdr, int idx,
+static errno_t section_hdr_load(int fd, const elf_header_t *elf_hdr, int idx,
     elf_section_header_t *sec_hdr)
 {
-        int rc;
+        errno_t rc;
         size_t nread;
         aoff64_t pos = elf_hdr->e_shoff + idx * sizeof(elf_section_header_t);
@@ -326 +328 @@
  * @return              EOK on success or EIO on failure.
  */
-static int chunk_load(int fd, off64_t start, size_t size, void **ptr)
-{
-        int rc;
+static errno_t chunk_load(int fd, off64_t start, size_t size, void **ptr)
+{
+        errno_t rc;
         size_t nread;
         aoff64_t pos = start;