X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fpayload-view.cpp;h=d5e67961b54b49b680993b9593986c3166638cea;hb=c9e313bc594f40a86eed237dce222c0fc99c957f;hp=3ea043c8aa0c7fb4a9051a890e020465f09d8636;hpb=7586404633a22e219a7ffd7a0f2624b5bc56e37b;p=lttng-tools.git

diff --git a/src/common/payload-view.cpp b/src/common/payload-view.cpp
index 3ea043c8a..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,9 +24,11 @@ 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,
+		._iterator = {},
 	} : (struct lttng_payload_view) {
 		.buffer = {},
-		._fd_handles = {}
+		._fd_handles = {},
+		._iterator = {},
 	};
 }
 
@@ -41,10 +43,12 @@ 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) {
 		.buffer = {},
-		._fd_handles = {}
+		._fd_handles = {},
+		._iterator = {},
 	};
 }
 
@@ -55,10 +59,12 @@ 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),
-		._fd_handles = {}
+		._fd_handles = {},
+		._iterator = {},
 	} : (struct lttng_payload_view) {
 		.buffer = {},
-		._fd_handles = {}
+		._fd_handles = {},
+		._iterator = {},
 	};
 }
 
@@ -69,10 +75,12 @@ 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),
-		._fd_handles = {}
+		._fd_handles = {},
+		._iterator = {},
 	} : (struct lttng_payload_view) {
 		.buffer = {},
-		._fd_handles = {}
+		._fd_handles = {},
+		._iterator = {},
 	};
 }
 
@@ -82,7 +90,8 @@ struct lttng_payload_view lttng_payload_view_init_from_buffer(
 	return (struct lttng_payload_view) {
 		.buffer = lttng_buffer_view_init(
 			src, offset, len),
-		._fd_handles = {}
+		._fd_handles = {},
+		._iterator = {},
 	};
 }