Fix file descriptor leak and typo in conf.c

[lttng-tools.git] / src / bin / lttng / conf.c

diff --git a/src/bin/lttng/conf.c b/src/bin/lttng/conf.c
index 9d2bfbb665206b7a239ccf3476416793c0840463..cdd264a5d11a3246e4430a3acce5cf354a68e731 100644 (file)
--- a/src/bin/lttng/conf.c
+++ b/src/bin/lttng/conf.c
@@ -25,7 +25,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <common/lttngerr.h>
+#include <common/error.h>
 
 #include "conf.h"
 
@@ -171,7 +171,7 @@ char *config_read_session_name(char *path)
        fp = open_config(path, "r");
        if (fp == NULL) {
                ERR("Can't find valid lttng config %s/.lttngrc", path);
-               MSG("Did you create a session? (lttng create <my_sesion>)");
+               MSG("Did you create a session? (lttng create <my_session>)");
                goto error;
        }
 
@@ -180,7 +180,7 @@ char *config_read_session_name(char *path)
                if ((ret = fscanf(fp, "%[^'=']=%s\n", var, session_name)) != 2) {
                        if (ret == -1) {
                                ERR("Missing session=NAME in config file.");
-                               goto error;
+                               goto error_close;
                        }
                        continue;
                }
@@ -190,6 +190,7 @@ char *config_read_session_name(char *path)
                }
        }
 
+error_close:
        fclose(fp);
 
 error: