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