X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng%2Futils.c;h=1b2138cedbd1531afe12db32a4cb463f84670afc;hb=7d29a2477524f7ee2ee46a94e538e6141f5ecc0e;hp=b05fd2283f43798c781da4635121356826d2a57a;hpb=f3ed775ef4842019b396f06095b053c3a70bc3c8;p=lttng-tools.git

diff --git a/lttng/utils.c b/lttng/utils.c
index b05fd2283..1b2138ced 100644
--- a/lttng/utils.c
+++ b/lttng/utils.c
@@ -20,34 +20,7 @@
 
 #include <lttng/lttng.h>
 
-#include "config.h"
-
-/*
- *  get_config_file_path
- *
- *  Return absolute path to the configuration file.
- */
-char *get_config_file_path(void)
-{
-	char *alloc_path, *path = NULL;
-
-	/* Get path to config directory */
-	alloc_path = config_get_default_path();
-	if (alloc_path == NULL) {
-		goto error;
-	}
-
-	/* Get path to config file */
-	path = config_generate_dir_path(alloc_path);
-	if (path == NULL) {
-		goto free_alloc_path;
-	}
-
-free_alloc_path:
-	free(alloc_path);
-error:
-	return path;
-}
+#include "conf.h"
 
 /*
  *  get_session_name
@@ -60,7 +33,7 @@ char *get_session_name(void)
 	char *path, *session_name = NULL;
 
 	/* Get path to config file */
-	path = get_config_file_path();
+	path = config_get_default_path();
 	if (path == NULL) {
 		goto error;
 	}
@@ -68,11 +41,9 @@ char *get_session_name(void)
 	/* Get session name from config */
 	session_name = config_read_session_name(path);
 	if (session_name == NULL) {
-		goto free_path;
+		goto error;
 	}
 
-free_path:
-	free(path);
 error:
 	return session_name;
 }
@@ -82,19 +53,24 @@ error:
  *
  *  Get session name and set it for the lttng control lib.
  */
-int set_session_name(void)
+int set_session_name(char *name)
 {
 	int ret;
 	char *session_name;
 
-	session_name = get_session_name();
-	if (session_name == NULL) {
-		ret = -1;
-		goto error;
+	if (!name) {
+		session_name = get_session_name();
+		if (session_name == NULL) {
+			ret = -1;
+			goto error;
+		}
+	} else {
+		session_name = name;
 	}
 
 	lttng_set_session_name(session_name);
-	free(session_name);
+	if (!name)
+		free(session_name);
 
 	ret = 0;