Changeset c566782 in mainline

Timestamp:

2011-07-25T20:24:56Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

aa865ee

Parents:

6348376

Message:

Use read_all() in elf_load.c.

File:

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

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

@@ -74 +74 @@
 static int load_segment(elf_ld_t *elf, elf_segment_header_t *entry);
 
-/** Read until the buffer is read in its entirety. */
-static int my_read(int fd, void *buf, size_t len)
-{
-        int cnt = 0;
-        do {
-                buf += cnt;
-                len -= cnt;
-                cnt = read(fd, buf, len);
-        } while ((cnt > 0) && ((len - cnt) > 0));
-
-        return cnt;
-}
-
 /** Load ELF binary from a file.
  *
@@ -160 +147 @@
         int i, rc;
 
-        rc = my_read(elf->fd, header, sizeof(elf_header_t));
+        rc = read_all(elf->fd, header, sizeof(elf_header_t));
         if (rc < 0) {
                 DPRINTF("Read error.\n"); 
@@ -222 +209 @@
                         + i * sizeof(elf_segment_header_t), SEEK_SET);
 
-                rc = my_read(elf->fd, &segment_hdr,
+                rc = read_all(elf->fd, &segment_hdr,
                     sizeof(elf_segment_header_t));
                 if (rc < 0) {
@@ -244 +231 @@
                     + i * sizeof(elf_section_header_t), SEEK_SET);
 
-                rc = my_read(elf->fd, &section_hdr,
+                rc = read_all(elf->fd, &section_hdr,
                     sizeof(elf_section_header_t));
                 if (rc < 0) {
@@ -412 +399 @@
                 if (now > left) now = left;
 
-                rc = my_read(elf->fd, dp, now);
+                rc = read_all(elf->fd, dp, now);
 
                 if (rc < 0) {