X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.cpp;fp=src%2Fbin%2Flttng%2Fcommands%2Flist.cpp;h=5f52a57f6dcd4973faad510c66461bb65c6c0d01;hp=8636cd101850d5557e489e2671add4ede354e4cc;hb=5b915816f16e7cb3134dd7279abad79b31c2486c;hpb=3957512ed31ca945f8353d5812f317314c905640

diff --git a/src/bin/lttng/commands/list.cpp b/src/bin/lttng/commands/list.cpp
index 8636cd101..5f52a57f6 100644
--- a/src/bin/lttng/commands/list.cpp
+++ b/src/bin/lttng/commands/list.cpp
@@ -2271,7 +2271,7 @@ end:
 int cmd_list(int argc, const char **argv)
 {
 	int opt, ret = CMD_SUCCESS;
-	const char *session_name, *leftover = NULL;
+	const char *arg_session_name, *leftover = NULL;
 	static poptContext pc;
 	struct lttng_domain domain;
 	struct lttng_domain *domains = NULL;
@@ -2330,8 +2330,8 @@ int cmd_list(int argc, const char **argv)
 	}
 
 	/* Get session name (trailing argument) */
-	session_name = poptGetArg(pc);
-	DBG2("Session name: %s", session_name);
+	arg_session_name = poptGetArg(pc);
+	DBG2("Session name: %s", arg_session_name);
 
 	leftover = poptGetArg(pc);
 	if (leftover) {
@@ -2361,14 +2361,14 @@ int cmd_list(int argc, const char **argv)
 	}
 
 	if (opt_kernel || opt_userspace || opt_jul || opt_log4j || opt_python) {
-		the_handle = lttng_create_handle(session_name, &domain);
+		the_handle = lttng_create_handle(arg_session_name, &domain);
 		if (the_handle == NULL) {
 			ret = CMD_FATAL;
 			goto end;
 		}
 	}
 
-	if (session_name == NULL) {
+	if (arg_session_name == NULL) {
 		if (!opt_kernel && !opt_userspace && !opt_jul && !opt_log4j
 				&& !opt_python) {
 			ret = list_sessions(NULL);
@@ -2416,19 +2416,19 @@ int cmd_list(int argc, const char **argv)
 			}
 		}
 		/* MI: the ouptut of list_sessions is an unclosed session element */
-		ret = list_sessions(session_name);
+		ret = list_sessions(arg_session_name);
 		if (ret) {
 			goto end;
 		}
 
-		ret = list_rotate_settings(session_name);
+		ret = list_rotate_settings(arg_session_name);
 		if (ret) {
 			goto end;
 		}
 
 		/* Domain listing */
 		if (opt_domain) {
-			ret = list_domains(session_name);
+			ret = list_domains(arg_session_name);
 			goto end;
 		}
 
@@ -2479,7 +2479,7 @@ int cmd_list(int argc, const char **argv)
 			int i, nb_domain;
 
 			/* We want all domain(s) */
-			nb_domain = lttng_list_domains(session_name, &domains);
+			nb_domain = lttng_list_domains(arg_session_name, &domains);
 			if (nb_domain < 0) {
 				ret = CMD_ERROR;
 				ERR("%s", lttng_strerror(nb_domain));
@@ -2534,7 +2534,7 @@ int cmd_list(int argc, const char **argv)
 				}
 
 				the_handle = lttng_create_handle(
-						session_name, &domains[i]);
+						arg_session_name, &domains[i]);
 				if (the_handle == NULL) {
 					ret = CMD_FATAL;
 					goto end;