From: Jonathan Rajotte Julien <jonathan.r.julien@gmail.com>
Date: Mon, 21 Jul 2014 18:19:41 +0000 (-0400)
Subject: Mi fix: conserve original error handling behaviour
X-Git-Tag: v2.6.0-rc1~110
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=1ec06ed3123d87c850c6e269b074512ed0985831;p=lttng-tools.git

Mi fix: conserve original error handling behaviour

Make sure success is put to zero when an error happens
---

diff --git a/src/bin/lttng/commands/snapshot.c b/src/bin/lttng/commands/snapshot.c
index ebe1d14aa..f3ef3aff4 100644
--- a/src/bin/lttng/commands/snapshot.c
+++ b/src/bin/lttng/commands/snapshot.c
@@ -294,7 +294,6 @@ static int mi_del_output(uint32_t id, const char *name)
 
 	ret = lttng_snapshot_del_output(current_session_name, output);
 	if (ret < 0) {
-		ret = CMD_FATAL;
 		goto error;
 	}
 
@@ -377,7 +376,6 @@ static int mi_add_output(const char *url)
 	/* This call, if successful, populates the id of the output object. */
 	ret = lttng_snapshot_add_output(current_session_name, output);
 	if (ret < 0) {
-		ret = CMD_ERROR;
 		goto error;
 	}
 
@@ -672,10 +670,10 @@ static int handle_command(const char **argv)
 		cmd = &actions[i];
 	}
 
-	ret = -CMD_UNDEFINED;
+	ret = CMD_UNDEFINED;
 
 end:
-	/* Overwrite ret if an error occured in cmd->func() */
+	/* Overwrite ret if an error occurred in cmd->func() */
 	ret = command_ret ? command_ret : ret;
 	return ret;
 }
@@ -761,7 +759,7 @@ int cmd_snapshot(int argc, const char **argv)
 	}
 
 	command_ret = handle_command(poptGetArgs(pc));
-	if (command_ret < 0) {
+	if (command_ret) {
 		switch (-command_ret) {
 		case LTTNG_ERR_EPERM:
 			ERR("The session needs to be set in no output mode (--no-output)");