fix: relayd: unaligned access in trace_chunk_registry_ht_key_hash

[lttng-tools.git] / src / bin / lttng-relayd / utils.cpp

diff --git a/src/bin/lttng-relayd/utils.cpp b/src/bin/lttng-relayd/utils.cpp
index 52ac19e8a65c8641b06a9a7a86dd7bbc7a4a7583..3d02f6044b20cd66b5a9920fc18ebdcedcf04a05 100644 (file)
--- a/src/bin/lttng-relayd/utils.cpp
+++ b/src/bin/lttng-relayd/utils.cpp
@@ -7,32 +7,31 @@
  */
 
 #define _LGPL_SOURCE
+#include "lttng-relayd.hpp"
+#include "utils.hpp"
+
+#include <common/common.hpp>
+#include <common/defaults.hpp>
+#include <common/path.hpp>
+#include <common/utils.hpp>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <common/common.h>
-#include <common/defaults.h>
-#include <common/utils.h>
-#include <common/path.h>
-
-#include "lttng-relayd.h"
-#include "utils.h"
-
 static char *create_output_path_auto(const char *path_name)
 {
        int ret;
-       char *traces_path = NULL;
+       char *traces_path = nullptr;
        const char *default_path;
 
        default_path = utils_get_home_dir();
-       if (default_path == NULL) {
+       if (default_path == nullptr) {
                ERR("Home path not found.\n \
                                Please specify an output path using -o, --output PATH");
                goto exit;
        }
-       ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME
-                       "/%s", default_path, path_name);
+       ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME "/%s", default_path, path_name);
        if (ret < 0) {
                PERROR("asprintf trace dir name");
                goto exit;
@@ -44,7 +43,7 @@ exit:
 static char *create_output_path_noauto(const char *path_name)
 {
        int ret;
-       char *traces_path = NULL;
+       char *traces_path = nullptr;
        char *full_path;
 
        full_path = utils_expand_path(opt_output_path);
@@ -71,7 +70,7 @@ char *create_output_path(const char *path_name)
 {
        LTTNG_ASSERT(path_name);
 
-       if (opt_output_path == NULL) {
+       if (opt_output_path == nullptr) {
                return create_output_path_auto(path_name);
        } else {
                return create_output_path_noauto(path_name);