Fix: lttng: incorrect domain list printed when no domain is provided

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

diff --git a/src/bin/lttng/utils.c b/src/bin/lttng/utils.c
index 1e3b91344d24ae58470b2cb966758402bd41c322..e7df32b934d2432a27b92a780baaa0b3429d809b 100644 (file)
--- a/src/bin/lttng/utils.c
+++ b/src/bin/lttng/utils.c
@@ -51,7 +51,8 @@ static const char *str_function = "Function";
 static
 char *_get_session_name(int quiet)
 {
-       char *path, *session_name = NULL;
+       const char *path;
+       char *session_name = NULL;
 
        /* Get path to config file */
        path = utils_get_home_dir();
@@ -441,15 +442,19 @@ error_socket:
        return ret;
 }
 
-int print_missing_or_multiple_domains(unsigned int sum)
+int print_missing_or_multiple_domains(unsigned int domain_count,
+               bool include_agent_domains)
 {
        int ret = 0;
 
-       if (sum == 0) {
-               ERR("Please specify a domain (-k/-u/-j).");
+       if (domain_count == 0) {
+               ERR("Please specify a domain (--kernel/--userspace%s).",
+                               include_agent_domains ?
+                                               "/--jul/--log4j/--python" :
+                                               "");
                ret = -1;
-       } else if (sum > 1) {
-               ERR("Multiple domains specified.");
+       } else if (domain_count > 1) {
+               ERR("Only one domain must be specified.");
                ret = -1;
        }