Clean-up: modernize pretty_xml.cpp

[lttng-tools.git] / src / common / payload-view.cpp

diff --git a/src/common/payload-view.cpp b/src/common/payload-view.cpp
index b1a44368da2001916b4f977d04865d5b2f97390a..0f41027bd0dcabb3389a0d80e8ac52ae14ef592b 100644 (file)
--- a/src/common/payload-view.cpp
+++ b/src/common/payload-view.cpp
@@ -5,10 +5,12 @@
  *
  */
 
-#include <common/dynamic-array.h>
-#include <common/buffer-view.h>
-#include "payload-view.h"
-#include "payload.h"
+#include "payload-view.hpp"
+#include "payload.hpp"
+
+#include <common/buffer-view.hpp>
+#include <common/dynamic-array.hpp>
+
 #include <stddef.h>
 
 bool lttng_payload_view_is_valid(const struct lttng_payload_view *view)
@@ -16,20 +18,25 @@ bool lttng_payload_view_is_valid(const struct lttng_payload_view *view)
        return view && lttng_buffer_view_is_valid(&view->buffer);
 }
 
-struct lttng_payload_view lttng_payload_view_from_payload(
-               const struct lttng_payload *payload, size_t offset,
-               ptrdiff_t len)
+struct lttng_payload_view
+lttng_payload_view_from_payload(const struct lttng_payload *payload, size_t offset, ptrdiff_t len)
 {
-       return payload ? (struct lttng_payload_view) {
-               .buffer = lttng_buffer_view_from_dynamic_buffer(
-                       &payload->buffer, offset, len),
-               ._fd_handles = payload->_fd_handles,
-               } : (struct lttng_payload_view) {};
+       return payload ?
+               (struct lttng_payload_view){
+                       .buffer = lttng_buffer_view_from_dynamic_buffer(
+                               &payload->buffer, offset, len),
+                       ._fd_handles = payload->_fd_handles,
+                       ._iterator = {},
+               } :
+               (struct lttng_payload_view){
+                       .buffer = {},
+                       ._fd_handles = {},
+                       ._iterator = {},
+               };
 }
 
-struct lttng_payload_view lttng_payload_view_from_view(
-               struct lttng_payload_view *view, size_t offset,
-               ptrdiff_t len)
+struct lttng_payload_view
+lttng_payload_view_from_view(struct lttng_payload_view *view, size_t offset, ptrdiff_t len)
 {
        return view ? (struct lttng_payload_view) {
                .buffer = lttng_buffer_view_from_view(
@@ -38,41 +45,59 @@ 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(
-               const struct lttng_dynamic_buffer *buffer, size_t offset,
-               ptrdiff_t len)
+       const struct lttng_dynamic_buffer *buffer, size_t offset, ptrdiff_t len)
 {
-       return buffer ? (struct lttng_payload_view) {
-               .buffer = lttng_buffer_view_from_dynamic_buffer(
-                       buffer, offset, len)
-               } : (struct lttng_payload_view) {};
+       return buffer ?
+               (struct lttng_payload_view){
+                       .buffer = lttng_buffer_view_from_dynamic_buffer(buffer, offset, len),
+                       ._fd_handles = {},
+                       ._iterator = {},
+               } :
+               (struct lttng_payload_view){
+                       .buffer = {},
+                       ._fd_handles = {},
+                       ._iterator = {},
+               };
 }
 
-struct lttng_payload_view lttng_payload_view_from_buffer_view(
-               const struct lttng_buffer_view *view, size_t offset,
-               ptrdiff_t len)
+struct lttng_payload_view lttng_payload_view_from_buffer_view(const struct lttng_buffer_view *view,
+                                                             size_t offset,
+                                                             ptrdiff_t len)
 {
-       return view ? (struct lttng_payload_view) {
-               .buffer = lttng_buffer_view_from_view(
-                       view, offset, len)
-               } : (struct lttng_payload_view) {};
+       return view ?
+               (struct lttng_payload_view){
+                       .buffer = lttng_buffer_view_from_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(
-       const char *src, size_t offset, ptrdiff_t len)
+struct lttng_payload_view
+lttng_payload_view_init_from_buffer(const char *src, size_t offset, ptrdiff_t len)
 {
-       return (struct lttng_payload_view) {
-               .buffer = lttng_buffer_view_init(
-                       src, offset, len)
+       return (struct lttng_payload_view){
+               .buffer = lttng_buffer_view_init(src, offset, len),
+               ._fd_handles = {},
+               ._iterator = {},
        };
 }
 
-int lttng_payload_view_get_fd_handle_count(
-               const struct lttng_payload_view *payload_view)
+int lttng_payload_view_get_fd_handle_count(const struct lttng_payload_view *payload_view)
 {
        int ret;
        size_t position;
@@ -88,17 +113,16 @@ int lttng_payload_view_get_fd_handle_count(
        }
 
        position = payload_view->_iterator.p_fd_handles_position ?
-                       *payload_view->_iterator.p_fd_handles_position :
-                       payload_view->_iterator.fd_handles_position;
+               *payload_view->_iterator.p_fd_handles_position :
+               payload_view->_iterator.fd_handles_position;
        ret = ret - (int) position;
 end:
        return ret;
 }
 
-struct fd_handle *lttng_payload_view_pop_fd_handle(
-               struct lttng_payload_view *view)
+struct fd_handle *lttng_payload_view_pop_fd_handle(struct lttng_payload_view *view)
 {
-       struct fd_handle *handle = NULL;
+       struct fd_handle *handle = nullptr;
        size_t fd_handle_count;
        size_t *pos;
 
@@ -111,11 +135,9 @@ struct fd_handle *lttng_payload_view_pop_fd_handle(
                goto end;
        }
 
-       pos = view->_iterator.p_fd_handles_position ?
-                       view->_iterator.p_fd_handles_position :
-                       &view->_iterator.fd_handles_position;
-       handle = (fd_handle *) lttng_dynamic_pointer_array_get_pointer(&view->_fd_handles,
-                       *pos);
+       pos = view->_iterator.p_fd_handles_position ? view->_iterator.p_fd_handles_position :
+                                                     &view->_iterator.fd_handles_position;
+       handle = (fd_handle *) lttng_dynamic_pointer_array_get_pointer(&view->_fd_handles, *pos);
        (*pos)++;
        fd_handle_get(handle);
 end: