X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Fcommands%2Fset_session.c;h=df0297f9fe99b84e04ddf57adfe808eaa5421d2b;hp=f89545fd46e258831b67cec91643f92837381265;hb=6e2d116c6138874c0357b1afb1db5aa7cd80ceb6;hpb=3087ef18ecb79a3fcef9c8bb8a3e9dc1ea228ff0 diff --git a/lttng/commands/set_session.c b/lttng/commands/set_session.c index f89545fd4..df0297f9f 100644 --- 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 #include -#include "cmd.h" -#include "conf.h" -#include "utils.h" +#include "../cmd.h" +#include "../conf.h" +#include "../utils.h" static char *opt_session_name; @@ -59,25 +59,11 @@ static void usage(FILE *ofp) static int set_session(void) { int ret = CMD_SUCCESS; - char *path, *alloc_path; + char *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); + path = config_get_default_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; + ret = -1; goto error; }