X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fsnapshot.c;h=c37e09a7dbed02eb1c192481c0955544808e4d7b;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=22531e8f223070914cad1f37ad8bcbabc51fbae1;hpb=050dd63950efb32bc79cdb68866792d4f808a1b0;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/snapshot.c b/src/bin/lttng/commands/snapshot.c
index 22531e8f2..c37e09a7d 100644
--- a/src/bin/lttng/commands/snapshot.c
+++ b/src/bin/lttng/commands/snapshot.c
@@ -6,7 +6,6 @@
  */
 
 #define _LGPL_SOURCE
-#include <assert.h>
 #include <inttypes.h>
 #include <popt.h>
 #include <stdio.h>
@@ -15,7 +14,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <assert.h>
 
 #include <common/utils.h>
 #include <common/mi-lttng.h>
@@ -81,7 +79,7 @@ static int count_arguments(const char **argv)
 {
 	int i = 0;
 
-	assert(argv);
+	LTTNG_ASSERT(argv);
 
 	while (argv[i] != NULL) {
 		i++;
@@ -473,7 +471,7 @@ static enum cmd_error_code handle_command(const char **argv)
 
 	argc = count_arguments(argv);
 	/* popt should have passed NULL if no arguments are present. */
-	assert(argc > 0);
+	LTTNG_ASSERT(argc > 0);
 
 	cmd = &actions[i];
 	while (cmd->func != NULL) {
@@ -624,10 +622,11 @@ int cmd_snapshot(int argc, const char **argv)
 		case OPT_MAX_SIZE:
 		{
 			uint64_t val;
-			const char *opt = poptGetOptArg(pc);
+			const char *max_size_arg = poptGetOptArg(pc);
 
-			if (utils_parse_size_suffix((char *) opt, &val) < 0) {
-				ERR("Unable to handle max-size value %s", opt);
+			if (utils_parse_size_suffix((char *) max_size_arg, &val) < 0) {
+				ERR("Unable to handle max-size value %s",
+						max_size_arg);
 				cmd_ret = CMD_ERROR;
 				goto end;
 			}