X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fsave.cpp;fp=src%2Fbin%2Flttng%2Fcommands%2Fsave.cpp;h=91e80394e734d8fb0621490379faa14d75da295c;hp=9b939102ccb8c8d8511c7cbefedd6c8c702645d6;hb=5b915816f16e7cb3134dd7279abad79b31c2486c;hpb=3957512ed31ca945f8353d5812f317314c905640

diff --git a/src/bin/lttng/commands/save.cpp b/src/bin/lttng/commands/save.cpp
index 9b939102c..91e80394e 100644
--- a/src/bin/lttng/commands/save.cpp
+++ b/src/bin/lttng/commands/save.cpp
@@ -116,7 +116,7 @@ int cmd_save(int argc, const char **argv)
 {
 	int ret = CMD_SUCCESS, command_ret = CMD_SUCCESS, success;
 	int opt;
-	const char *session_name = NULL, *leftover = NULL;
+	const char *arg_session_name = NULL, *leftover = NULL;
 	poptContext pc;
 	struct lttng_save_session_attr *attr;
 
@@ -144,9 +144,9 @@ int cmd_save(int argc, const char **argv)
 	}
 
 	if (!opt_save_all) {
-		session_name = poptGetArg(pc);
-		if (session_name) {
-			DBG2("Session name: %s", session_name);
+		arg_session_name = poptGetArg(pc);
+		if (arg_session_name) {
+			DBG2("Session name: %s", arg_session_name);
 		} else {
 			/* default to opt_save_all */
 			opt_save_all = true;
@@ -166,7 +166,7 @@ int cmd_save(int argc, const char **argv)
 		goto end_destroy;
 	}
 
-	if (lttng_save_session_attr_set_session_name(attr, session_name)) {
+	if (lttng_save_session_attr_set_session_name(attr, arg_session_name)) {
 		ret = CMD_ERROR;
 		goto end_destroy;
 	}
@@ -212,12 +212,12 @@ int cmd_save(int argc, const char **argv)
 		success = 0;
 	} else {
 		/* Inform the user of what just happened on success. */
-		if (session_name && opt_output_path) {
-			MSG("Session %s saved successfully in %s.", session_name,
+		if (arg_session_name && opt_output_path) {
+			MSG("Session %s saved successfully in %s.", arg_session_name,
 					opt_output_path);
-		} else if (session_name && !opt_output_path) {
-			MSG("Session %s saved successfully.", session_name);
-		} else if (!session_name && opt_output_path) {
+		} else if (arg_session_name && !opt_output_path) {
+			MSG("Session %s saved successfully.", arg_session_name);
+		} else if (!arg_session_name && opt_output_path) {
 			MSG("All sessions have been saved successfully in %s.",
 					opt_output_path);
 		} else {
@@ -229,7 +229,7 @@ int cmd_save(int argc, const char **argv)
 	/* Mi Printing and closing */
 	if (lttng_opt_mi) {
 		/* Mi print */
-		ret = mi_save_print(session_name);
+		ret = mi_save_print(arg_session_name);
 		if (ret) {
 			ret = CMD_ERROR;
 			goto end_destroy;