X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fpayload-view.cpp;h=d5e67961b54b49b680993b9593986c3166638cea;hb=5219e670edb63d5a4b34e095475045e6540f461b;hp=b1a44368da2001916b4f977d04865d5b2f97390a;hpb=a6bc4ca9d659caf016ef932fcd944029737ac57c;p=lttng-tools.git

diff --git a/src/common/payload-view.cpp b/src/common/payload-view.cpp
index b1a44368d..d5e67961b 100644
--- a/src/common/payload-view.cpp
+++ b/src/common/payload-view.cpp
@@ -5,10 +5,10 @@
  *
  */
 
-#include <common/dynamic-array.h>
-#include <common/buffer-view.h>
-#include "payload-view.h"
-#include "payload.h"
+#include <common/dynamic-array.hpp>
+#include <common/buffer-view.hpp>
+#include "payload-view.hpp"
+#include "payload.hpp"
 #include <stddef.h>
 
 bool lttng_payload_view_is_valid(const struct lttng_payload_view *view)
@@ -24,7 +24,12 @@ struct lttng_payload_view lttng_payload_view_from_payload(
 		.buffer = lttng_buffer_view_from_dynamic_buffer(
 			&payload->buffer, offset, len),
 		._fd_handles = payload->_fd_handles,
-		} : (struct lttng_payload_view) {};
+		._iterator = {},
+	} : (struct lttng_payload_view) {
+		.buffer = {},
+		._fd_handles = {},
+		._iterator = {},
+	};
 }
 
 struct lttng_payload_view lttng_payload_view_from_view(
@@ -38,8 +43,13 @@ struct lttng_payload_view lttng_payload_view_from_view(
 		._iterator = {
 			.p_fd_handles_position = view->_iterator.p_fd_handles_position ?:
 				&view->_iterator.fd_handles_position,
+			.fd_handles_position = 0,
 		}
-	} : (struct lttng_payload_view) {};
+	} : (struct lttng_payload_view) {
+		.buffer = {},
+		._fd_handles = {},
+		._iterator = {},
+	};
 }
 
 struct lttng_payload_view lttng_payload_view_from_dynamic_buffer(
@@ -48,8 +58,14 @@ struct lttng_payload_view lttng_payload_view_from_dynamic_buffer(
 {
 	return buffer ? (struct lttng_payload_view) {
 		.buffer = lttng_buffer_view_from_dynamic_buffer(
-			buffer, offset, len)
-		} : (struct lttng_payload_view) {};
+			buffer, offset, len),
+		._fd_handles = {},
+		._iterator = {},
+	} : (struct lttng_payload_view) {
+		.buffer = {},
+		._fd_handles = {},
+		._iterator = {},
+	};
 }
 
 struct lttng_payload_view lttng_payload_view_from_buffer_view(
@@ -58,8 +74,14 @@ struct lttng_payload_view lttng_payload_view_from_buffer_view(
 {
 	return view ? (struct lttng_payload_view) {
 		.buffer = lttng_buffer_view_from_view(
-			view, offset, len)
-		} : (struct lttng_payload_view) {};
+			view, offset, len),
+		._fd_handles = {},
+		._iterator = {},
+	} : (struct lttng_payload_view) {
+		.buffer = {},
+		._fd_handles = {},
+		._iterator = {},
+	};
 }
 
 struct lttng_payload_view lttng_payload_view_init_from_buffer(
@@ -67,7 +89,9 @@ struct lttng_payload_view lttng_payload_view_init_from_buffer(
 {
 	return (struct lttng_payload_view) {
 		.buffer = lttng_buffer_view_init(
-			src, offset, len)
+			src, offset, len),
+		._fd_handles = {},
+		._iterator = {},
 	};
 }