Cleanup: elf: use off_t for offsets, size_t for len

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/lttng/ust-elf.h b/include/lttng/ust-elf.h
index fee52f9ef2ff0f5f432968f524e1e6dd0051d926..6e9d99518dce20027b11e9a2ebf343a8dec42d25 100644 (file)
--- a/include/lttng/ust-elf.h
+++ b/include/lttng/ust-elf.h
@@ -195,9 +195,9 @@ struct lttng_ust_elf_nhdr {
 
 struct lttng_ust_elf {
        /* Offset in bytes to start of section names string table. */
-       uint64_t section_names_offset;
+       off_t section_names_offset;
        /* Size in bytes of section names string table. */
-       uint64_t section_names_size;
+       size_t section_names_size;
        char *path;
        int fd;
        struct lttng_ust_elf_ehdr *ehdr;

diff --git a/liblttng-ust/lttng-ust-elf.c b/liblttng-ust/lttng-ust-elf.c
index 8d3fc573f1b4fe8f0cbf655c54fa329c77efd2d7..9186ee90cb7ab093a27b8eabcc03370076e5a3a8 100644 (file)
--- a/liblttng-ust/lttng-ust-elf.c
+++ b/liblttng-ust/lttng-ust-elf.c
@@ -39,7 +39,7 @@ struct lttng_ust_elf_phdr *lttng_ust_elf_get_phdr(struct lttng_ust_elf *elf,
                                                uint16_t index)
 {
        struct lttng_ust_elf_phdr *phdr = NULL;
-       long offset;
+       off_t offset;
 
        if (!elf) {
                goto error;
@@ -54,7 +54,8 @@ struct lttng_ust_elf_phdr *lttng_ust_elf_get_phdr(struct lttng_ust_elf *elf,
                goto error;
        }
 
-       offset = elf->ehdr->e_phoff + index * elf->ehdr->e_phentsize;
+       offset = (off_t) elf->ehdr->e_phoff
+                       + (off_t) index * elf->ehdr->e_phentsize;
        if (lseek(elf->fd, offset, SEEK_SET) < 0) {
                goto error;
        }
@@ -161,7 +162,7 @@ error:
  * If no name is found, NULL is returned.
  */
 static
-char *lttng_ust_elf_get_section_name(struct lttng_ust_elf *elf, uint32_t offset)
+char *lttng_ust_elf_get_section_name(struct lttng_ust_elf *elf, off_t offset)
 {
        char *name = NULL;
        size_t len = 0, to_read;        /* len does not include \0 */
@@ -404,7 +405,7 @@ error:
 static
 int lttng_ust_elf_get_build_id_from_segment(
        struct lttng_ust_elf *elf, uint8_t **build_id, size_t *length,
-       uint64_t offset, uint64_t segment_end, int *found)
+       off_t offset, off_t segment_end, int *found)
 {
        uint8_t *_build_id = NULL;      /* Silence old gcc warning. */
        size_t _length = 0;             /* Silence old gcc warning. */
@@ -506,7 +507,7 @@ int lttng_ust_elf_get_build_id(struct lttng_ust_elf *elf, uint8_t **build_id,
        }
 
        for (i = 0; i < elf->ehdr->e_phnum; ++i) {
-               uint64_t offset, segment_end;
+               off_t offset, segment_end;
                struct lttng_ust_elf_phdr *phdr;
                int ret = 0;