Rename C++ header files to .hpp

[lttng-tools.git] / tests / utils / testapp / gen-ust-events-ns / gen-ust-events-ns.cpp

diff --git a/tests/utils/testapp/gen-ust-events-ns/gen-ust-events-ns.cpp b/tests/utils/testapp/gen-ust-events-ns/gen-ust-events-ns.cpp
index dadfc3d3a00301bc81ba044ef19403585812ccda..ba506b1131b57eeb1e2f8313e16dc90546ba5d60 100644 (file)
--- a/tests/utils/testapp/gen-ust-events-ns/gen-ust-events-ns.cpp
+++ b/tests/utils/testapp/gen-ust-events-ns/gen-ust-events-ns.cpp
@@ -17,10 +17,12 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <inttypes.h>
 
-#include <common/compat/tid.h>
+#include <common/compat/tid.hpp>
+#include <common/macros.hpp>
 
-#include "signal-helper.h"
+#include "signal-helper.hpp"
 #include "utils.h"
 
 #define TRACEPOINT_DEFINE
@@ -77,7 +79,8 @@ struct poptOption opts[] = {
        { NULL, 0, 0, NULL, 0 }
 };
 
-static void debug_printf(const char *format, ...)
+static ATTR_FORMAT_PRINTF(1, 2)
+void debug_printf(const char *format, ...)
 {
        va_list args;
        va_start(args, format);
@@ -131,7 +134,7 @@ static int do_the_needful(int ns_flag, const char *ns_str)
                ret = -1;
                goto end;
        }
-       debug_printf("Initial %s ns inode number:      %lu\n", ns_str, ns1);
+       debug_printf("Initial %s ns inode number:      %" PRIuMAX "\n", ns_str, (uintmax_t) ns1);
 
        for (i = 0; nr_iter < 0 || i < nr_iter; i++) {
                tracepoint(tp, tptest, ns1);
@@ -153,7 +156,7 @@ static int do_the_needful(int ns_flag, const char *ns_str)
                ret = -1;
                goto end;
        }
-       debug_printf("Post unshare %s ns inode number: %lu\n", ns_str, ns2);
+       debug_printf("Post unshare %s ns inode number: %" PRIuMAX "\n", ns_str, (uintmax_t) ns2);
 
        /*
         * Signal that we emited the first event group and that the