Remove format strings warnings when compiling on 32 bits

On 32 bits, %lu expects a 32 bits integer, so changed some %lu for PRIu64 when printing a 64 bits integer.

Signed-off-by: Simon Marchi <simon.marchi@polymtl.ca>

diff --git a/lttng/commands/enable_channels.c b/lttng/commands/enable_channels.c
index 1878096bf511bef95c50ba45dfdae70ce8c22b66..efd075b95e29c7169fe9c15ee59412714dc42b65 100644 (file)
--- a/lttng/commands/enable_channels.c
+++ b/lttng/commands/enable_channels.c
@@ -24,6 +24,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <inttypes.h>
 
 #include "../cmd.h"
 #include "../conf.h"
@@ -197,11 +198,11 @@ int cmd_enable_channels(int argc, const char **argv)
                        break;
                case OPT_SUBBUF_SIZE:
                        chan.attr.subbuf_size = atol(poptGetOptArg(pc));
-                       DBG("Channel subbuf size set to %lu", chan.attr.subbuf_size);
+                       DBG("Channel subbuf size set to %" PRIu64, chan.attr.subbuf_size);
                        break;
                case OPT_NUM_SUBBUF:
                        chan.attr.num_subbuf = atoi(poptGetOptArg(pc));
-                       DBG("Channel subbuf num set to %lu", chan.attr.num_subbuf);
+                       DBG("Channel subbuf num set to %" PRIu64, chan.attr.num_subbuf);
                        break;
                case OPT_SWITCH_TIMER:
                        chan.attr.switch_timer_interval = atoi(poptGetOptArg(pc));

diff --git a/lttng/commands/enable_events.c b/lttng/commands/enable_events.c
index 70caf6fbbedc9a846c67599530e471b7b35217e9..9fa2349ee877ab19460d7bb0643f66ab1bee56c7 100644 (file)
--- a/lttng/commands/enable_events.c
+++ b/lttng/commands/enable_events.c
@@ -24,6 +24,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <inttypes.h>
 
 #include "../cmd.h"
 #include "../conf.h"
@@ -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;
        }