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

File:

• uspace/app/taskdump/elf_core.c (modified) (10 diffs)

uspace/app/taskdump/elf_core.c

@@ -55 +55 @@
 #include <stddef.h>
 #include <errno.h>
-#include <str_error.h>
 #include <mem.h>
 #include <as.h>
@@ -98 +97 @@
 
         int fd;
-        int rc;
-        size_t nwr;
+        ssize_t rc;
         unsigned int i;
 
@@ -124 +122 @@
         }
 
-        rc = vfs_lookup_open(file_name, WALK_REGULAR | WALK_MAY_CREATE,
-            MODE_WRITE, &fd);
-        if (rc != EOK) {
-                printf("Failed opening file '%s': %s.\n", file_name, str_error(rc));
+        fd = vfs_lookup_open(file_name, WALK_REGULAR | WALK_MAY_CREATE,
+            MODE_WRITE);
+        if (fd < 0) {
+                printf("Failed opening file.\n");
                 free(p_hdr);
                 return ENOENT;
@@ -208 +206 @@
         }
 
-        rc = vfs_write(fd, &pos, &elf_hdr, sizeof(elf_hdr), &nwr);
-        if (rc != EOK) {
+        rc = vfs_write(fd, &pos, &elf_hdr, sizeof(elf_hdr));
+        if (rc != sizeof(elf_hdr)) {
                 printf("Failed writing ELF header.\n");
                 free(p_hdr);
@@ -216 +214 @@
 
         for (i = 0; i < n_ph; ++i) {
-                rc = vfs_write(fd, &pos, &p_hdr[i], sizeof(p_hdr[i]), &nwr);
-                if (rc != EOK) {
+                rc = vfs_write(fd, &pos, &p_hdr[i], sizeof(p_hdr[i]));
+                if (rc != sizeof(p_hdr[i])) {
                         printf("Failed writing program header.\n");
                         free(p_hdr);
@@ -233 +231 @@
         note.type = NT_PRSTATUS;
 
-        rc = vfs_write(fd, &pos, &note, sizeof(elf_note_t), &nwr);
-        if (rc != EOK) {
+        rc = vfs_write(fd, &pos, &note, sizeof(elf_note_t));
+        if (rc != sizeof(elf_note_t)) {
                 printf("Failed writing note header.\n");
                 free(p_hdr);
@@ -240 +238 @@
         }
 
-        rc = vfs_write(fd, &pos, "CORE", note.namesz, &nwr);
-        if (rc != EOK) {
+        rc = vfs_write(fd, &pos, "CORE", note.namesz);
+        if (rc != (ssize_t) note.namesz) {
                 printf("Failed writing note header.\n");
                 free(p_hdr);
@@ -249 +247 @@
         pos = ALIGN_UP(pos, word_size);
 
-        rc = vfs_write(fd, &pos, &pr_status, sizeof(elf_prstatus_t), &nwr);
-        if (rc != EOK) {
+        rc = vfs_write(fd, &pos, &pr_status, sizeof(elf_prstatus_t));
+        if (rc != sizeof(elf_prstatus_t)) {
                 printf("Failed writing register data.\n");
                 free(p_hdr);
@@ -298 +296 @@
         size_t total;
         uintptr_t addr;
-        int rc;
-        size_t nwr;
+        ssize_t rc;
 
         addr = area->start_addr;
@@ -312 +309 @@
                 }
 
-                rc = vfs_write(fd, pos, buffer, to_copy, &nwr);
-                if (rc != EOK) {
+                rc = vfs_write(fd, pos, buffer, to_copy);
+                if (rc != (ssize_t) to_copy) {
                         printf("Failed writing memory contents.\n");
                         return EIO;