Cleanup: apply `include-what-you-use` guideline for `uint*_t`

[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 f2c098297acab8955df876f01f97d2a738dc0a81..5de3561fbeefcc71a56522f8763fb628dbdcede3 100644 (file)
--- a/liblttng-ust/lttng-ust-elf.c
+++ b/liblttng-ust/lttng-ust-elf.c
@@ -18,16 +18,19 @@
 
 #define _GNU_SOURCE
 #define _LGPL_SOURCE
+#include <fcntl.h>
 #include <helper.h>
-#include <string.h>
 #include <lttng/align.h>
 #include <lttng/ust-elf.h>
-#include <sys/types.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <string.h>
 #include <sys/stat.h>
-#include <fcntl.h>
+#include <sys/types.h>
 #include <unistd.h>
-#include <stdbool.h>
+
 #include <ust-fd.h>
+
 #include "lttng-tracer-core.h"
 
 #define BUF_LEN        4096
@@ -243,12 +246,15 @@ struct lttng_ust_elf *lttng_ust_elf_create(const char *path)
        uint8_t e_ident[EI_NIDENT];
        struct lttng_ust_elf_shdr *section_names_shdr;
        struct lttng_ust_elf *elf = NULL;
+       int ret, fd;
 
        elf = zmalloc(sizeof(struct lttng_ust_elf));
        if (!elf) {
                goto error;
        }
 
+       /* Initialize fd field to -1. 0 is a valid fd number */
+       elf->fd = -1;
 
        elf->path = strdup(path);
        if (!elf->path) {
@@ -256,12 +262,23 @@ struct lttng_ust_elf *lttng_ust_elf_create(const char *path)
        }
 
        lttng_ust_lock_fd_tracker();
-       elf->fd = open(elf->path, O_RDONLY | O_CLOEXEC);
-       if (elf->fd < 0) {
+       fd = open(elf->path, O_RDONLY | O_CLOEXEC);
+       if (fd < 0) {
+               lttng_ust_unlock_fd_tracker();
+               goto error;
+       }
+
+       ret = lttng_ust_add_fd_to_tracker(fd);
+       if (ret < 0) {
+               ret = close(fd);
+               if (ret) {
+                       PERROR("close on elf->fd");
+               }
+               ret = -1;
                lttng_ust_unlock_fd_tracker();
                goto error;
        }
-       lttng_ust_add_fd_to_tracker(elf->fd);
+       elf->fd = ret;
        lttng_ust_unlock_fd_tracker();
 
        if (lttng_ust_read(elf->fd, e_ident, EI_NIDENT) < EI_NIDENT) {