Fix: warning 'fd' may be used uninitialized

Initialize fd to invalid '-1' and remove unnecessary file_opened.

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/bin/lttng-sessiond/save.c b/src/bin/lttng-sessiond/save.c
index ce9f2f9ff1772910ac5ce1a1b3b8023e566214c9..00cdd9364d5f4ff6c7b438debfb66972b9084e4b 100644 (file)
--- a/src/bin/lttng-sessiond/save.c
+++ b/src/bin/lttng-sessiond/save.c
@@ -2284,8 +2284,7 @@ static
 int save_session(struct ltt_session *session,
        struct lttng_save_session_attr *attr, lttng_sock_cred *creds)
 {
 int save_session(struct ltt_session *session,
        struct lttng_save_session_attr *attr, lttng_sock_cred *creds)
 {

-       int ret, fd;
-       unsigned int file_opened = 0;   /* Indicate if the file has been opened */
+       int ret, fd = -1;

        char config_file_path[PATH_MAX];
        size_t len;
        struct config_writer *writer = NULL;
        char config_file_path[PATH_MAX];
        size_t len;
        struct config_writer *writer = NULL;


@@ -2378,7 +2377,6 @@ int save_session(struct ltt_session *session,
                ret = LTTNG_ERR_SAVE_IO_FAIL;
                goto end;
        }
                ret = LTTNG_ERR_SAVE_IO_FAIL;
                goto end;
        }

-       file_opened = 1;

 
        writer = config_writer_create(fd, 1);
        if (!writer) {
 
        writer = config_writer_create(fd, 1);
        if (!writer) {


@@ -2492,12 +2490,12 @@ end:
        }
        if (ret) {
                /* Delete file in case of error */
        }
        if (ret) {
                /* Delete file in case of error */

-               if (file_opened && unlink(config_file_path)) {
+               if ((fd >= 0) && unlink(config_file_path)) {

                        PERROR("Unlinking XML session configuration.");
                }
        }
 
                        PERROR("Unlinking XML session configuration.");
                }
        }
 

-       if (file_opened) {
+       if (fd >= 0) {

                ret = close(fd);
                if (ret) {
                        PERROR("Closing XML session configuration");
                ret = close(fd);
                if (ret) {
                        PERROR("Closing XML session configuration");