X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fdisable_rotation.c;h=f5c197f9b8b642aae7fc5fbac24b3d206b703aaf;hp=30dfaa1691db929295cce3cba2a0ef921fd06c57;hb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a;hpb=66ea93b10c703e1b3dda1e17109eed9138e4ece2

diff --git a/src/bin/lttng/commands/disable_rotation.c b/src/bin/lttng/commands/disable_rotation.c
index 30dfaa169..f5c197f9b 100644
--- a/src/bin/lttng/commands/disable_rotation.c
+++ b/src/bin/lttng/commands/disable_rotation.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2017 - Julien Desfossez <jdesfossez@efficios.com>
+ * Copyright (C) 2017 Julien Desfossez <jdesfossez@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
@@ -225,7 +215,7 @@ int cmd_disable_rotation(int argc, const char **argv)
 	pc = poptGetContext(NULL, argc, argv, long_options, 0);
 	popt_ret = poptReadDefaultConfig(pc, 0);
 	if (popt_ret) {
-		ret = CMD_ERROR;
+		cmd_ret = CMD_ERROR;
 		ERR("poptReadDefaultConfig");
 		goto end;
 	}
@@ -245,7 +235,7 @@ int cmd_disable_rotation(int argc, const char **argv)
 			size_rotation = true;
 			break;
 		default:
-			ret = CMD_UNDEFINED;
+			cmd_ret = CMD_UNDEFINED;
 			goto end;
 		}
 	}
@@ -313,7 +303,7 @@ int cmd_disable_rotation(int argc, const char **argv)
 	}
 
 	if (size_rotation) {
-		enum lttng_error_code tmp_ret;
+		enum cmd_error_code tmp_ret;
 
 		/* Don't overwrite cmd_ret if it already indicates an error. */
 		tmp_ret = remove_schedule(session_name,