Changeset 5a6cc679 in mainline for uspace/lib/c/generic/elf/elf_mod.c

Timestamp:

2018-01-31T02:21:24Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

• uspace/lib/c/generic/elf/elf_mod.c (modified) (5 diffs)

uspace/lib/c/generic/elf/elf_mod.c

@@ -99 +99 @@
 
         int ofile;
-        int rc = vfs_clone(file, -1, true, &ofile);
+        errno_t rc = vfs_clone(file, -1, true, &ofile);
         if (rc == EOK) {
                 rc = vfs_open(ofile, MODE_READ);
@@ -121 +121 @@
 {
         int file;
-        int rc = vfs_lookup(path, 0, &file);
+        errno_t rc = vfs_lookup(path, 0, &file);
         if (rc == EOK) {
                 int ret = elf_load_file(file, so_bias, flags, info);
@@ -148 +148 @@
         size_t nr;
         int i, ret;
-        int rc;
+        errno_t rc;
 
         rc = vfs_read(elf->fd, &pos, header, sizeof(elf_header_t), &nr);
@@ -341 +341 @@
         size_t mem_sz;
         aoff64_t pos;
-        int rc;
+        errno_t rc;
         size_t nr;
 
@@ -414 +414 @@
 //      printf("set area flags to %d\n", flags);
         rc = as_area_change_flags(seg_ptr, flags);
-        if (rc != 0) {
+        if (rc != EOK) {
                 DPRINTF("Failed to set memory area flags.\n");
                 return EE_MEMORY;