Cleanup: eliminate implicit sign-extension

[lttng-ust.git] / liblttng-ust / lttng-ust-elf.c

diff --git a/liblttng-ust/lttng-ust-elf.c b/liblttng-ust/lttng-ust-elf.c
index e71436b422fd0ca202c3fc6ed65abc670774a6b9..8d3fc573f1b4fe8f0cbf655c54fa329c77efd2d7 100644 (file)
--- a/liblttng-ust/lttng-ust-elf.c
+++ b/liblttng-ust/lttng-ust-elf.c
@@ -101,7 +101,7 @@ struct lttng_ust_elf_shdr *lttng_ust_elf_get_shdr(struct lttng_ust_elf *elf,
                                                uint16_t index)
 {
        struct lttng_ust_elf_shdr *shdr = NULL;
-       long offset;
+       off_t offset;
 
        if (!elf) {
                goto error;
@@ -116,7 +116,8 @@ struct lttng_ust_elf_shdr *lttng_ust_elf_get_shdr(struct lttng_ust_elf *elf,
                goto error;
        }
 
-       offset = elf->ehdr->e_shoff + index * elf->ehdr->e_shentsize;
+       offset = (off_t) elf->ehdr->e_shoff
+               + (off_t) index * elf->ehdr->e_shentsize;
        if (lseek(elf->fd, offset, SEEK_SET) < 0) {
                goto error;
        }
@@ -405,8 +406,8 @@ 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)
 {
-       uint8_t *_build_id;
-       size_t _length;
+       uint8_t *_build_id = NULL;      /* Silence old gcc warning. */
+       size_t _length = 0;             /* Silence old gcc warning. */
        int _found = 0;
 
        while (offset < segment_end) {
@@ -452,7 +453,7 @@ int lttng_ust_elf_get_build_id_from_segment(
 
                _length = nhdr.n_descsz;
                _build_id = zmalloc(sizeof(uint8_t) * _length);
-               if (!build_id) {
+               if (!_build_id) {
                        goto error;
                }
 
@@ -496,8 +497,8 @@ int lttng_ust_elf_get_build_id(struct lttng_ust_elf *elf, uint8_t **build_id,
                        size_t *length, int *found)
 {
        uint16_t i;
-       uint8_t *_build_id;
-       size_t _length;
+       uint8_t *_build_id = NULL;      /* Silence old gcc warning. */
+       size_t _length = 0;             /* Silence old gcc warning. */
        int _found = 0;
 
        if (!elf || !build_id || !length || !found) {
@@ -561,10 +562,10 @@ int lttng_ust_elf_get_debug_link_from_section(struct lttng_ust_elf *elf,
                                        struct lttng_ust_elf_shdr *shdr)
 {
        int _found = 0;
-       char *_filename;
+       char *_filename = NULL;         /* Silence old gcc warning. */
        size_t filename_len;
        char *section_name = NULL;
-       uint32_t _crc;
+       uint32_t _crc = 0;              /* Silence old gcc warning. */
 
        if (!elf || !filename || !crc || !found || !shdr) {
                goto error;
@@ -645,8 +646,8 @@ int lttng_ust_elf_get_debug_link(struct lttng_ust_elf *elf, char **filename,
        int ret;
        uint16_t i;
        int _found = 0;
-       char *_filename;
-       uint32_t _crc;
+       char *_filename = NULL;         /* Silence old gcc warning. */
+       uint32_t _crc = 0;              /* Silence old gcc warning. */
 
        if (!elf || !filename || !crc || !found) {
                goto error;