X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fcreate.c;h=b266c10a9397a8e250c0c156a5d7e2fef547db46;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=379ca0a660908c1e3454fafd3d193b83e029e081;hpb=b53d4e59bf0a980aa774dcccc27123986e77b8ff;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c
index 379ca0a66..b266c10a9 100644
--- a/src/bin/lttng/commands/create.c
+++ b/src/bin/lttng/commands/create.c
@@ -7,7 +7,6 @@
  */
 
 #define _LGPL_SOURCE
-#include <assert.h>
 #include <ctype.h>
 #include <popt.h>
 #include <stdio.h>
@@ -29,8 +28,7 @@
 #include <common/sessiond-comm/sessiond-comm.h>
 #include <common/uri.h>
 #include <common/utils.h>
-#include <lttng/snapshot.h>
-#include <lttng/session-descriptor.h>
+#include <lttng/lttng.h>
 
 static char *opt_output_path;
 static char *opt_session_name;
@@ -90,8 +88,8 @@ static int mi_created_session(const char *session_name)
 	struct lttng_session *sessions;
 
 	/* session_name should not be null */
-	assert(session_name);
-	assert(writer);
+	LTTNG_ASSERT(session_name);
+	LTTNG_ASSERT(writer);
 
 	count = lttng_list_sessions(&sessions);
 	if (count < 0) {
@@ -133,7 +131,6 @@ end:
 static
 struct lttng_session_descriptor *create_session_descriptor(void)
 {
-	int ret;
 	ssize_t uri_count;
 	enum output_type output_type;
 	struct lttng_uri *uris = NULL;
@@ -145,6 +142,7 @@ struct lttng_session_descriptor *create_session_descriptor(void)
 		output_type = OUTPUT_NONE;
 	} else if (opt_output_path) {
 		char *expanded_output_path;
+		int ret;
 
 		output_type = OUTPUT_LOCAL;
 		expanded_output_path = utils_expand_path(opt_output_path);
@@ -161,6 +159,8 @@ struct lttng_session_descriptor *create_session_descriptor(void)
 			goto end;
 		}
 	} else if (opt_url || opt_ctrl_url) {
+		int ret;
+
 		uri_str1 = opt_ctrl_url ? opt_ctrl_url : opt_url;
 		uri_str2 = opt_data_url;