Rename C++ header files to .hpp

[lttng-tools.git] / src / bin / lttng-sessiond / ust-metadata.cpp

diff --git a/src/bin/lttng-sessiond/ust-metadata.cpp b/src/bin/lttng-sessiond/ust-metadata.cpp
index abe473f27ce78c6032f4de2b5d1bc869aaa31a0b..f5c5e7a2136c9cb2a533e4f90a6f1cfa08aef811 100644 (file)
--- a/src/bin/lttng-sessiond/ust-metadata.cpp
+++ b/src/bin/lttng-sessiond/ust-metadata.cpp
@@ -13,12 +13,12 @@
 #include <limits.h>
 #include <unistd.h>
 #include <inttypes.h>
-#include <common/common.h>
-#include <common/time.h>
+#include <common/common.hpp>
+#include <common/time.hpp>
 
-#include "ust-registry.h"
-#include "ust-clock.h"
-#include "ust-app.h"
+#include "ust-registry.hpp"
+#include "ust-clock.hpp"
+#include "ust-app.hpp"
 
 #ifndef max_t
 #define max_t(type, a, b)      ((type) ((a) > (b) ? (a) : (b)))
@@ -106,7 +106,7 @@ int metadata_file_append(struct ust_registry_session *session,
  * remaining space left in packet and write, since mutual exclusion
  * protects us from concurrent writes.
  */
-static
+static ATTR_FORMAT_PRINTF(2, 3)
 int lttng_metadata_printf(struct ust_registry_session *session,
                const char *fmt, ...)
 {
@@ -315,10 +315,10 @@ int ust_metadata_enum_statedump(struct ust_registry_session *session,
 
                        if (entry->start.signedness) {
                                ret = lttng_metadata_printf(session,
-                                       "%lld", (long long) entry->start.value);
+                                       "%" PRId64, entry->start.value);
                        } else {
                                ret = lttng_metadata_printf(session,
-                                       "%llu", entry->start.value);
+                                       "%" PRIu64, entry->start.value);
                        }
                        if (ret) {
                                goto end;
@@ -331,11 +331,11 @@ int ust_metadata_enum_statedump(struct ust_registry_session *session,
                        } else {
                                if (entry->end.signedness) {
                                        ret = lttng_metadata_printf(session,
-                                               " ... %lld,\n",
-                                               (long long) entry->end.value);
+                                               " ... %" PRId64 ",\n",
+                                               entry->end.value);
                                } else {
                                        ret = lttng_metadata_printf(session,
-                                               " ... %llu,\n",
+                                               " ... %" PRIu64 ",\n",
                                                entry->end.value);
                                }
                        }
@@ -369,10 +369,6 @@ int _lttng_variant_statedump(struct ust_registry_session *session,
        int ret;
        char identifier[LTTNG_UST_ABI_SYM_NAME_LEN];
 
-       if (variant->type.atype != lttng_ust_ctl_atype_variant) {
-               ret = -EINVAL;
-               goto end;
-       }
        (*iter_field)++;
        sanitize_ctf_identifier(identifier, tag_name);
        if (alignment) {