X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsnapshot.cpp;h=191f484c255b0d5a9669737b07e6fff8b3c535cb;hp=618196dd86f02b30f46f207cb95653bf8c3a86a7;hb=HEAD;hpb=c9e313bc594f40a86eed237dce222c0fc99c957f

diff --git a/src/common/snapshot.cpp b/src/common/snapshot.cpp
index 618196dd8..765c11cb4 100644
--- a/src/common/snapshot.cpp
+++ b/src/common/snapshot.cpp
@@ -10,6 +10,7 @@
 #include <common/payload-view.hpp>
 #include <common/payload.hpp>
 #include <common/snapshot.hpp>
+
 #include <lttng/snapshot-internal.hpp>
 #include <lttng/snapshot.h>
 
@@ -46,9 +47,8 @@ end:
 	return valid;
 }
 
-bool lttng_snapshot_output_is_equal(
-		const struct lttng_snapshot_output *a,
-		const struct lttng_snapshot_output *b)
+bool lttng_snapshot_output_is_equal(const struct lttng_snapshot_output *a,
+				    const struct lttng_snapshot_output *b)
 {
 	bool equal = false;
 
@@ -77,6 +77,7 @@ end:
 	return equal;
 }
 
+namespace {
 /*
  * This is essentially the same as `struct lttng_snapshot_output`, but packed.
  */
@@ -87,10 +88,10 @@ struct lttng_snapshot_output_comm {
 	char ctrl_url[PATH_MAX];
 	char data_url[PATH_MAX];
 } LTTNG_PACKED;
+} /* namespace */
 
-int lttng_snapshot_output_serialize(
-		const struct lttng_snapshot_output *output,
-		struct lttng_payload *payload)
+int lttng_snapshot_output_serialize(const struct lttng_snapshot_output *output,
+				    struct lttng_payload *payload)
 {
 	struct lttng_snapshot_output_comm comm;
 	int ret;
@@ -103,20 +104,17 @@ int lttng_snapshot_output_serialize(
 		goto end;
 	}
 
-	ret = lttng_strncpy(
-			comm.ctrl_url, output->ctrl_url, sizeof(comm.ctrl_url));
+	ret = lttng_strncpy(comm.ctrl_url, output->ctrl_url, sizeof(comm.ctrl_url));
 	if (ret) {
 		goto end;
 	}
 
-	ret = lttng_strncpy(
-			comm.data_url, output->data_url, sizeof(comm.data_url));
+	ret = lttng_strncpy(comm.data_url, output->data_url, sizeof(comm.data_url));
 	if (ret) {
 		goto end;
 	}
 
-	ret = lttng_dynamic_buffer_append(
-			&payload->buffer, &comm, sizeof(comm));
+	ret = lttng_dynamic_buffer_append(&payload->buffer, &comm, sizeof(comm));
 	if (ret) {
 		goto end;
 	}
@@ -125,12 +123,11 @@ end:
 	return ret;
 }
 
-ssize_t lttng_snapshot_output_create_from_payload(
-		struct lttng_payload_view *view,
-		struct lttng_snapshot_output **output_p)
+ssize_t lttng_snapshot_output_create_from_payload(struct lttng_payload_view *view,
+						  struct lttng_snapshot_output **output_p)
 {
 	const struct lttng_snapshot_output_comm *comm;
-	struct lttng_snapshot_output *output = NULL;
+	struct lttng_snapshot_output *output = nullptr;
 	int ret;
 
 	if (view->buffer.size != sizeof(*comm)) {
@@ -154,20 +151,18 @@ ssize_t lttng_snapshot_output_create_from_payload(
 		goto end;
 	}
 
-	ret = lttng_strncpy(output->ctrl_url, comm->ctrl_url,
-			sizeof(output->ctrl_url));
+	ret = lttng_strncpy(output->ctrl_url, comm->ctrl_url, sizeof(output->ctrl_url));
 	if (ret) {
 		goto end;
 	}
 
-	ret = lttng_strncpy(output->data_url, comm->data_url,
-			sizeof(output->data_url));
+	ret = lttng_strncpy(output->data_url, comm->data_url, sizeof(output->data_url));
 	if (ret) {
 		goto end;
 	}
 
 	*output_p = output;
-	output = NULL;
+	output = nullptr;
 	ret = sizeof(*comm);
 
 end:
@@ -175,9 +170,8 @@ end:
 	return ret;
 }
 
-enum lttng_error_code lttng_snapshot_output_mi_serialize(
-		const struct lttng_snapshot_output *output,
-		struct mi_writer *writer)
+enum lttng_error_code lttng_snapshot_output_mi_serialize(const struct lttng_snapshot_output *output,
+							 struct mi_writer *writer)
 {
 	int ret;
 	enum lttng_error_code ret_code;
@@ -186,8 +180,7 @@ enum lttng_error_code lttng_snapshot_output_mi_serialize(
 	LTTNG_ASSERT(writer);
 
 	/* Open output element. */
-	ret = mi_lttng_writer_open_element(writer,
-			mi_lttng_element_action_snapshot_session_output);
+	ret = mi_lttng_writer_open_element(writer, mi_lttng_element_action_snapshot_session_output);
 	if (ret) {
 		goto mi_error;
 	}
@@ -195,24 +188,23 @@ enum lttng_error_code lttng_snapshot_output_mi_serialize(
 	/* Name. */
 	if (strnlen(output->name, LTTNG_NAME_MAX) != 0) {
 		ret = mi_lttng_writer_write_element_string(
-				writer, config_element_name, output->name);
+			writer, config_element_name, output->name);
 		if (ret) {
 			goto mi_error;
 		}
 	}
 
 	/* Control url (always present). */
-	ret = mi_lttng_writer_write_element_string(writer,
-			mi_lttng_element_snapshot_ctrl_url, output->ctrl_url);
+	ret = mi_lttng_writer_write_element_string(
+		writer, mi_lttng_element_snapshot_ctrl_url, output->ctrl_url);
 	if (ret) {
 		goto mi_error;
 	}
 
 	/* Data url (optional). */
 	if (strnlen(output->data_url, PATH_MAX) != 0) {
-		ret = mi_lttng_writer_write_element_string(writer,
-				mi_lttng_element_snapshot_data_url,
-				output->data_url);
+		ret = mi_lttng_writer_write_element_string(
+			writer, mi_lttng_element_snapshot_data_url, output->data_url);
 		if (ret) {
 			goto mi_error;
 		}
@@ -228,9 +220,8 @@ enum lttng_error_code lttng_snapshot_output_mi_serialize(
 	 */
 	if (output->max_size > 0 && output->max_size != UINT64_MAX) {
 		/* Total size of all stream combined. */
-		ret = mi_lttng_writer_write_element_unsigned_int(writer,
-				mi_lttng_element_snapshot_max_size,
-				output->max_size);
+		ret = mi_lttng_writer_write_element_unsigned_int(
+			writer, mi_lttng_element_snapshot_max_size, output->max_size);
 		if (ret) {
 			goto mi_error;
 		}