Remove format strings warnings when compiling on 32 bits

[lttng-tools.git] / lttng / commands / enable_events.c

diff --git a/lttng/commands/enable_events.c b/lttng/commands/enable_events.c
index a95b45af89f8d970ae1a01ed1aef420b0e78f544..9fa2349ee877ab19460d7bb0643f66ab1bee56c7 100644 (file)
--- a/lttng/commands/enable_events.c
+++ b/lttng/commands/enable_events.c
@@ -24,10 +24,11 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <inttypes.h>
 
-#include "cmd.h"
-#include "conf.h"
-#include "utils.h"
+#include "../cmd.h"
+#include "../conf.h"
+#include "../utils.h"
 
 static char *opt_event_list;
 static int opt_event_type;
@@ -110,30 +111,30 @@ static int parse_kprobe_opts(struct lttng_event *ev, char *opt)
        }
 
        /* Check for symbol+offset */
-       ret = sscanf(opt, "%[^'+']+%li", name, &hex);
+       ret = sscanf(opt, "%[^'+']+%" SCNu64, name, &hex);
        if (ret == 2) {
                strncpy(ev->attr.probe.symbol_name, name, LTTNG_SYMBOL_NAME_LEN);
                DBG("kprobe symbol %s", ev->attr.probe.symbol_name);
                if (hex == 0) {
-                       ERR("Invalid kprobe offset %lu", hex);
+                       ERR("Invalid kprobe offset %" PRIu64, hex);
                        ret = -1;
                        goto error;
                }
                ev->attr.probe.offset = hex;
-               DBG("kprobe offset %lu", ev->attr.probe.offset);
+               DBG("kprobe offset %" PRIu64, ev->attr.probe.offset);
                goto error;
        }
 
        /* Check for address */
-       ret = sscanf(opt, "%li", &hex);
+       ret = sscanf(opt, "%" SCNu64, &hex);
        if (ret > 0) {
                if (hex == 0) {
-                       ERR("Invalid kprobe address %lu", hex);
+                       ERR("Invalid kprobe address %" PRIu64, hex);
                        ret = -1;
                        goto error;
                }
                ev->attr.probe.addr = hex;
-               DBG("kprobe addr %lu", ev->attr.probe.addr);
+               DBG("kprobe addr %" PRIu64, ev->attr.probe.addr);
                goto error;
        }
 
@@ -179,9 +180,9 @@ static int enable_events(void)
        if (opt_enable_all) {
                if (opt_kernel) {
                        ret = lttng_enable_event(&dom, NULL, channel_name);
-            if (ret == 0) {
-                MSG("All kernel events are enabled in channel %s", channel_name);
-            }
+                       if (ret == 0) {
+                               MSG("All kernel events are enabled in channel %s", channel_name);
+                       }
                        goto error;
                }