X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Ftrack-untrack.c;h=f175e2a86bb4f571061cfe6743d2492730cf19e6;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=d28f8a7e136b321989485976f9e007130655a36e;hpb=159b042f34366d0fde5dcd73b4231c558922a664;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/track-untrack.c b/src/bin/lttng/commands/track-untrack.c
index d28f8a7e1..f175e2a86 100644
--- a/src/bin/lttng/commands/track-untrack.c
+++ b/src/bin/lttng/commands/track-untrack.c
@@ -7,11 +7,6 @@
  *
  */
 
-#include "common/dynamic-buffer.h"
-#include "common/tracker.h"
-#include "lttng/domain.h"
-#include "lttng/lttng-error.h"
-#include "lttng/tracker.h"
 #define _LGPL_SOURCE
 #include <ctype.h>
 #include <popt.h>
@@ -22,13 +17,16 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <assert.h>
 
 #include <urcu/list.h>
 
 #include <common/dynamic-array.h>
 #include <common/mi-lttng.h>
 #include <common/optional.h>
+#include <common/dynamic-buffer.h>
+#include <common/tracker.h>
+
+#include <lttng/lttng.h>
 
 #include "../command.h"
 
@@ -284,7 +282,7 @@ static enum cmd_error_code run_command_string(enum cmd_type cmd_type,
 					strtoul(one_value_str, NULL, 10);
 
 			if (writer) {
-				const int ret = mi_lttng_integral_process_attribute_value(
+				ret = mi_lttng_integral_process_attribute_value(
 						writer, process_attr,
 						(int64_t) one_value_int, true);
 				if (ret) {
@@ -354,7 +352,7 @@ static enum cmd_error_code run_command_string(enum cmd_type cmd_type,
 
 		} else {
 			if (writer) {
-				const int ret = mi_lttng_string_process_attribute_value(
+				ret = mi_lttng_string_process_attribute_value(
 						writer, process_attr,
 						one_value_str, true);
 				if (ret) {
@@ -470,7 +468,7 @@ static enum cmd_error_code run_command_string(enum cmd_type cmd_type,
 		free(prettified_arg);
 
 		if (writer) {
-			int ret = mi_lttng_writer_write_element_bool(writer,
+			ret = mi_lttng_writer_write_element_bool(writer,
 					mi_lttng_element_success,
 					cmd_ret == CMD_SUCCESS);