X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Factions%2Fpath.cpp;h=383c64839688b8913fdcd631ee5946c2b1139293;hb=cd9adb8b829564212158943a0d279bb35322ab30;hp=41fb92e27bddfc2e599a72807e9de7feefaeb216;hpb=1ad48d9678f8f123dc7d44dbbfadc9957b7e970e;p=lttng-tools.git

diff --git a/src/common/actions/path.cpp b/src/common/actions/path.cpp
index 41fb92e27..383c64839 100644
--- a/src/common/actions/path.cpp
+++ b/src/common/actions/path.cpp
@@ -14,12 +14,11 @@ struct lttng_action_path_comm {
 } LTTNG_PACKED;
 } /* namespace */
 
-struct lttng_action_path *lttng_action_path_create(
-		const uint64_t *indexes, size_t index_count)
+struct lttng_action_path *lttng_action_path_create(const uint64_t *indexes, size_t index_count)
 {
 	int ret;
 	size_t i;
-	struct lttng_action_path *path = NULL;
+	struct lttng_action_path *path = nullptr;
 
 	if (!indexes && index_count > 0) {
 		goto error;
@@ -30,11 +29,10 @@ struct lttng_action_path *lttng_action_path_create(
 		goto error;
 	}
 
-	lttng_dynamic_array_init(&path->indexes, sizeof(uint64_t), NULL);
+	lttng_dynamic_array_init(&path->indexes, sizeof(uint64_t), nullptr);
 
 	for (i = 0; i < index_count; i++) {
-		ret = lttng_dynamic_array_add_element(
-				&path->indexes, &indexes[i]);
+		ret = lttng_dynamic_array_add_element(&path->indexes, &indexes[i]);
 		if (ret) {
 			goto error;
 		}
@@ -43,13 +41,13 @@ struct lttng_action_path *lttng_action_path_create(
 	goto end;
 error:
 	lttng_action_path_destroy(path);
-	path = NULL;
+	path = nullptr;
 end:
 	return path;
 }
 
-enum lttng_action_path_status lttng_action_path_get_index_count(
-		const struct lttng_action_path *path, size_t *index_count)
+enum lttng_action_path_status
+lttng_action_path_get_index_count(const struct lttng_action_path *path, size_t *index_count)
 {
 	enum lttng_action_path_status status;
 
@@ -65,21 +63,17 @@ end:
 }
 
 enum lttng_action_path_status lttng_action_path_get_index_at_index(
-		const struct lttng_action_path *path,
-		size_t path_index,
-		uint64_t *out_index)
+	const struct lttng_action_path *path, size_t path_index, uint64_t *out_index)
 {
 	enum lttng_action_path_status status;
 
-	if (!path || !out_index ||
-			path_index >= lttng_dynamic_array_get_count(
-				&path->indexes)) {
+	if (!path || !out_index || path_index >= lttng_dynamic_array_get_count(&path->indexes)) {
 		status = LTTNG_ACTION_PATH_STATUS_INVALID;
 		goto end;
 	}
 
-	*out_index = *((typeof(out_index)) lttng_dynamic_array_get_element(
-			&path->indexes, path_index));
+	*out_index =
+		*((typeof(out_index)) lttng_dynamic_array_get_element(&path->indexes, path_index));
 	status = LTTNG_ACTION_PATH_STATUS_OK;
 end:
 	return status;
@@ -97,8 +91,7 @@ end:
 	return;
 }
 
-int lttng_action_path_copy(const struct lttng_action_path *src,
-		struct lttng_action_path **dst)
+int lttng_action_path_copy(const struct lttng_action_path *src, struct lttng_action_path **dst)
 {
 	int ret;
 	struct lttng_action_path *new_path;
@@ -107,9 +100,8 @@ int lttng_action_path_copy(const struct lttng_action_path *src,
 	LTTNG_ASSERT(dst);
 
 	new_path = lttng_action_path_create(
-			(uint64_t *) lttng_dynamic_array_get_element(
-				&src->indexes, 0), 
-			lttng_dynamic_array_get_count(&src->indexes));
+		(uint64_t *) lttng_dynamic_array_get_element(&src->indexes, 0),
+		lttng_dynamic_array_get_count(&src->indexes));
 	if (!new_path) {
 		ret = -1;
 	} else {
@@ -120,15 +112,14 @@ int lttng_action_path_copy(const struct lttng_action_path *src,
 	return ret;
 }
 
-ssize_t lttng_action_path_create_from_payload(
-		struct lttng_payload_view *view,
-		struct lttng_action_path **_action_path)
+ssize_t lttng_action_path_create_from_payload(struct lttng_payload_view *view,
+					      struct lttng_action_path **_action_path)
 {
 	ssize_t consumed_size = 0, ret = -1;
 	const struct lttng_action_path_comm *header;
-	struct lttng_action_path *action_path = NULL;
+	struct lttng_action_path *action_path = nullptr;
 	const struct lttng_payload_view header_view =
-			lttng_payload_view_from_view(view, 0, sizeof(*header));
+		lttng_payload_view_from_view(view, 0, sizeof(*header));
 
 	if (!lttng_payload_view_is_valid(&header_view)) {
 		goto end;
@@ -142,27 +133,22 @@ ssize_t lttng_action_path_create_from_payload(
 	 * single non-list action. Handle it differently since a payload view of
 	 * size 0 is considered invalid.
 	 */
-	if (header->index_count != 0)
-	{
-		const struct lttng_payload_view indexes_view =
-				lttng_payload_view_from_view(view,
-						consumed_size,
-						header->index_count *
-								sizeof(uint64_t));
+	if (header->index_count != 0) {
+		const struct lttng_payload_view indexes_view = lttng_payload_view_from_view(
+			view, consumed_size, header->index_count * sizeof(uint64_t));
 
 		if (!lttng_payload_view_is_valid(&indexes_view)) {
 			goto end;
 		}
 
 		consumed_size += indexes_view.buffer.size;
-		action_path = lttng_action_path_create(
-				(const uint64_t *) indexes_view.buffer.data,
-				header->index_count);
+		action_path = lttng_action_path_create((const uint64_t *) indexes_view.buffer.data,
+						       header->index_count);
 		if (!action_path) {
 			goto end;
 		}
 	} else {
-		action_path = lttng_action_path_create(NULL, 0);
+		action_path = lttng_action_path_create(nullptr, 0);
 		if (!action_path) {
 			goto end;
 		}
@@ -175,7 +161,7 @@ end:
 }
 
 int lttng_action_path_serialize(const struct lttng_action_path *action_path,
-		struct lttng_payload *payload)
+				struct lttng_payload *payload)
 {
 	int ret;
 	size_t index_count, i;
@@ -188,25 +174,21 @@ int lttng_action_path_serialize(const struct lttng_action_path *action_path,
 		goto end;
 	}
 
-	comm = {
-		.index_count = (uint32_t) index_count,
-	};
-	ret = lttng_dynamic_buffer_append(&payload->buffer,
-			&comm,
-			sizeof(struct lttng_action_path_comm));
+	comm.index_count = (uint32_t) index_count;
+	ret = lttng_dynamic_buffer_append(
+		&payload->buffer, &comm, sizeof(struct lttng_action_path_comm));
 
 	for (i = 0; i < index_count; i++) {
 		uint64_t path_index;
 
-		status = lttng_action_path_get_index_at_index(
-				action_path, i, &path_index);
+		status = lttng_action_path_get_index_at_index(action_path, i, &path_index);
 		if (status != LTTNG_ACTION_PATH_STATUS_OK) {
 			ret = -1;
 			goto end;
 		}
 
-		ret = lttng_dynamic_buffer_append(&payload->buffer, &path_index,
-				sizeof(path_index));
+		ret = lttng_dynamic_buffer_append(
+			&payload->buffer, &path_index, sizeof(path_index));
 		if (ret) {
 			goto end;
 		}