X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Futils.c;h=9957b378162b897a8743c8897425da51d27e0cb7;hp=ef8d0235a019229cf0c4c1b92c33a58275f8a6de;hb=3ecec76a3cd1eb6b301d03895ab425976ba28dee;hpb=6f04ed72990f6c72d16fd08d39feac0967da732e

diff --git a/src/bin/lttng/utils.c b/src/bin/lttng/utils.c
index ef8d0235a..9957b3781 100644
--- a/src/bin/lttng/utils.c
+++ b/src/bin/lttng/utils.c
@@ -40,13 +40,8 @@ static const char *str_jul = "JUL";
 static const char *str_log4j = "LOG4J";
 static const char *str_python = "Python";
 
-/*
- *  get_session_name
- *
- *  Return allocated string with the session name found in the config
- *  directory.
- */
-char *get_session_name(void)
+static
+char *_get_session_name(int quiet)
 {
 	char *path, *session_name = NULL;
 
@@ -57,7 +52,8 @@ char *get_session_name(void)
 	}
 
 	/* Get session name from config */
-	session_name = config_read_session_name(path);
+	session_name = quiet ? config_read_session_name_quiet(path) :
+		config_read_session_name(path);
 	if (session_name == NULL) {
 		goto error;
 	}
@@ -70,6 +66,28 @@ error:
 	return NULL;
 }
 
+/*
+ *  get_session_name
+ *
+ *  Return allocated string with the session name found in the config
+ *  directory.
+ */
+char *get_session_name(void)
+{
+	return _get_session_name(0);
+}
+
+/*
+ *  get_session_name_quiet (no warnings/errors emitted)
+ *
+ *  Return allocated string with the session name found in the config
+ *  directory.
+ */
+char *get_session_name_quiet(void)
+{
+	return _get_session_name(1);
+}
+
 /*
  *  list_commands
  *
@@ -383,3 +401,18 @@ error:
 error_socket:
 	return ret;
 }
+
+int print_missing_or_multiple_domains(unsigned int sum)
+{
+	int ret = 0;
+
+	if (sum == 0) {
+		ERR("Please specify a domain (-k/-u/-j).");
+		ret = -1;
+	} else if (sum > 1) {
+		ERR("Multiple domains specified.");
+		ret = -1;
+	}
+
+	return ret;
+}