Update version to 2.0-pre17

[lttng-tools.git] / lttng / commands / set_session.c

diff --git a/lttng/commands/set_session.c b/lttng/commands/set_session.c
index f89545fd46e258831b67cec91643f92837381265..8a76403ad43d922eeb31c679a8632c88e5d7d876 100644 (file)
--- a/lttng/commands/set_session.c
+++ b/lttng/commands/set_session.c
@@ -3,8 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,9 +25,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "cmd.h"
-#include "conf.h"
-#include "utils.h"
+#include "../cmd.h"
+#include "../conf.h"
+#include "../utils.h"
 
 static char *opt_session_name;
 
@@ -59,31 +59,10 @@ static void usage(FILE *ofp)
 static int set_session(void)
 {
        int ret = CMD_SUCCESS;
-       char *path, *alloc_path;
 
-       alloc_path = config_get_default_path();
-       if (alloc_path == NULL) {
-               ERR("Unable to find config directory");
-               ret = CMD_ERROR;
-               goto error;
-       }
-
-       path = config_generate_dir_path(alloc_path);
-       if (path == NULL) {
-               ret = CMD_FATAL;
-               goto error;
-       }
-
-       ret = config_init(path);
-       if (ret < 0) {
-               ERR("Init config directory and file failed");
-               ret = CMD_ERROR;
-               goto error;
-       }
-
-       ret = config_add_session_name(path, opt_session_name);
+       ret = config_init(opt_session_name);
        if (ret < 0) {
-               ERR("Unable to add session name to config");
+               ERR("Unable to set session name");
                ret = CMD_ERROR;
                goto error;
        }