Changeset c621f4aa in mainline for uspace/app/taskdump/symtab.c

Timestamp:

2010-07-25T10:11:13Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (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 with mainline.

File:

• uspace/app/taskdump/symtab.c (modified) (4 diffs)

uspace/app/taskdump/symtab.c

@@ -49 +49 @@
 static int section_hdr_load(int fd, const elf_header_t *ehdr, int idx,
     elf_section_header_t *shdr);
-static int chunk_load(int fd, off_t start, off_t size, void **ptr);
+static int chunk_load(int fd, off64_t start, size_t size, void **ptr);
 static int read_all(int fd, void *buf, size_t len);
 
@@ -65 +65 @@
         elf_header_t elf_hdr;
         elf_section_header_t sec_hdr;
-        off_t shstrt_start, shstrt_size;
+        off64_t shstrt_start;
+        size_t shstrt_size;
         char *shstrt, *sec_name;
         void *data;
@@ -307 +308 @@
         rc = lseek(fd, elf_hdr->e_shoff + idx * sizeof(elf_section_header_t),
             SEEK_SET);
-        if (rc == (off_t) -1)
+        if (rc == (off64_t) -1)
                 return EIO;
 
@@ -328 +329 @@
  * @return              EOK on success or EIO on failure.
  */
-static int chunk_load(int fd, off_t start, off_t size, void **ptr)
+static int chunk_load(int fd, off64_t start, size_t size, void **ptr)
 {
         int rc;
 
         rc = lseek(fd, start, SEEK_SET);
-        if (rc == (off_t) -1) {
+        if (rc == (off64_t) -1) {
                 printf("failed seeking chunk\n");
                 *ptr = NULL;