X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fsession-config.cpp;h=dfbddf2913d25550c7058ca96b9d7e54757501e9;hb=c9e313bc594f40a86eed237dce222c0fc99c957f;hp=2d2f303f5aef7d964d39eff93db69dbe4268b0c1;hpb=c922647daed3dd022be11980063b5fb816d8c091;p=lttng-tools.git

diff --git a/src/common/config/session-config.cpp b/src/common/config/session-config.cpp
index 2d2f303f5..dfbddf291 100644
--- a/src/common/config/session-config.cpp
+++ b/src/common/config/session-config.cpp
@@ -18,12 +18,12 @@
 #include <sys/stat.h>
 #include <stdbool.h>
 
-#include <common/defaults.h>
-#include <common/error.h>
-#include <common/macros.h>
-#include <common/utils.h>
-#include <common/dynamic-buffer.h>
-#include <common/compat/getenv.h>
+#include <common/defaults.hpp>
+#include <common/error.hpp>
+#include <common/macros.hpp>
+#include <common/utils.hpp>
+#include <common/dynamic-buffer.hpp>
+#include <common/compat/getenv.hpp>
 #include <lttng/lttng-error.h>
 #include <libxml/parser.h>
 #include <libxml/valid.h>
@@ -34,8 +34,8 @@
 #include <lttng/rotation.h>
 #include <lttng/userspace-probe.h>
 
-#include "session-config.h"
-#include "config-internal.h"
+#include "session-config.hpp"
+#include "config-internal.hpp"
 
 #define CONFIG_USERSPACE_PROBE_LOOKUP_METHOD_NAME_MAX_LEN 7
 
@@ -529,7 +529,7 @@ end:
 }
 
 static ATTR_FORMAT_PRINTF(2, 3)
-void xml_error_handler(void *ctx, const char *format, ...)
+void xml_error_handler(void *ctx __attribute__((unused)), const char *format, ...)
 {
 	char *errMsg;
 	va_list args;
@@ -1203,7 +1203,7 @@ int create_snapshot_session(const char *session_name, xmlNodePtr output_node,
 			xmlNextElementSibling(snapshot_output_node)) {
 		char *name = NULL;
 		uint64_t max_size = UINT64_MAX;
-		struct consumer_output output = { 0 };
+		struct consumer_output output = {};
 		struct lttng_snapshot_output *snapshot_output = NULL;
 		const char *control_uri = NULL;
 		const char *data_uri = NULL;
@@ -1329,7 +1329,7 @@ int create_session(const char *name,
 	const struct config_load_session_override_attr *overrides)
 {
 	int ret;
-	struct consumer_output output = { 0 };
+	struct consumer_output output = {};
 	xmlNodePtr consumer_output_node;
 	const char *control_uri = NULL;
 	const char *data_uri = NULL;
@@ -3859,7 +3859,7 @@ int config_load_session(const char *path, const char *session_name,
 	int ret;
 	bool session_loaded = false;
 	const char *path_ptr = NULL;
-	struct session_config_validation_ctx validation_ctx = { 0 };
+	struct session_config_validation_ctx validation_ctx = {};
 
 	ret = init_session_config_validation_ctx(&validation_ctx);
 	if (ret) {