Changeset ff381a7 in mainline for uspace/lib/c/generic/elf/elf_load.c

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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 mainline changes.

File:

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

uspace/lib/c/generic/elf/elf_load.c

@@ -97 +97 @@
         int fd;
         int rc;
-        
+
         fd = open(file_name, O_RDONLY);
         if (fd < 0) {
@@ -147 +147 @@
         int i, rc;
 
-        rc = read_all(elf->fd, header, sizeof(elf_header_t));
+        rc = read(elf->fd, header, sizeof(elf_header_t));
         if (rc != sizeof(elf_header_t)) {
                 DPRINTF("Read error.\n"); 
@@ -209 +209 @@
                         + i * sizeof(elf_segment_header_t), SEEK_SET);
 
-                rc = read_all(elf->fd, &segment_hdr,
+                rc = read(elf->fd, &segment_hdr,
                     sizeof(elf_segment_header_t));
                 if (rc != sizeof(elf_segment_header_t)) {
@@ -231 +231 @@
                     + i * sizeof(elf_section_header_t), SEEK_SET);
 
-                rc = read_all(elf->fd, &section_hdr,
+                rc = read(elf->fd, &section_hdr,
                     sizeof(elf_section_header_t));
                 if (rc != sizeof(elf_section_header_t)) {
@@ -399 +399 @@
                 if (now > left) now = left;
 
-                rc = read_all(elf->fd, dp, now);
+                rc = read(elf->fd, dp, now);
 
                 if (rc != (ssize_t) now) {