Skip to contentSkip to conversation

tools: gpio: fix %llu warnings

PATCH In review Kent Gibson 2 participants 4 messages Jan 7, 2021 – Jan 11, 2021

Subsystems (2)
lore
Share & tools
lore

Kent Gibson

author reviewer
#0 lore raw

cover tools: gpio: fix %llu warnings

Fix a couple of warnings that I ran across while testing selftest changes.

Sorry about the repetition in the checkin comments, but as the problem was introduced to the two files separately it seemed more appropriate than tying their history together.

Cheers,
Kent.

Kent Gibson (2):
tools: gpio: fix %llu warning in gpio-event-mon.c
tools: gpio: fix %llu warning in gpio-watch.c

 tools/gpio/gpio-event-mon.c | 4 ++--
 tools/gpio/gpio-watch.c     | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)
Signature · 1 line
2.30.0
author reviewer
#1 lore raw

PATCH 1/2 tools: gpio: fix %llu warning in gpio-event-mon.c

Some platforms, such as mips64, don't map __u64 to long long unsigned int so using %llu produces a warning:

gpio-event-mon.c:110:37: warning: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 3 has type ‘__u64’ {aka ‘long unsigned int’} [-Wformat=]

  110 |   fprintf(stdout, "GPIO EVENT at %llu on line %d (%d|%d) ",
      |                                  ~~~^
      |                                     |
      |                                     long long unsigned int
      |                                  %lu
  111 |    event.timestamp_ns, event.offset, event.line_seqno,
      |    ~~~~~~~~~~~~~~~~~~
      |         |
      |         __u64 {aka long unsigned int}

Replace the %llu with PRIu64 and cast the argument to uint64_t.

Fixes commit 03fd11b03362 ("tools/gpio/gpio-event-mon: fix warning")
---
 tools/gpio/gpio-event-mon.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/gpio/gpio-event-mon.c +2 -2
index cacd66ad7926..a2b233fdb572 100644
@@ -107,8 +107,8 @@ int monitor_device(const char *device_name,
 			ret = -EIO;
 			break;
 		}
-		fprintf(stdout, "GPIO EVENT at %llu on line %d (%d|%d) ",
-			event.timestamp_ns, event.offset, event.line_seqno,
+		fprintf(stdout, "GPIO EVENT at %" PRIu64 " on line %d (%d|%d) ",
+			(uint64_t)event.timestamp_ns, event.offset, event.line_seqno,
 			event.seqno);
 		switch (event.id) {
 		case GPIO_V2_LINE_EVENT_RISING_EDGE:
Signature · 1 line
2.30.0
author reviewer
#2 lore raw

PATCH 2/2 tools: gpio: fix %llu warning in gpio-watch.c

In reply to Kent Gibson

Some platforms, such as mips64, don't map __u64 to long long unsigned int so using %llu produces a warning:

gpio-watch.c: In function ‘main’:
gpio-watch.c:89:30: warning: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 4 has type ‘__u64’ {aka ‘long unsigned int’} [-Wformat=]

   89 |    printf("line %u: %s at %llu\n",
      |                           ~~~^
      |                              |
      |                              long long unsigned int
      |                           %lu
   90 |           chg.info.offset, event, chg.timestamp_ns);
      |                                   ~~~~~~~~~~~~~~~~
      |                                      |
      |                                      __u64 {aka long unsigned int}

Replace the %llu with PRIu64 and cast the argument to uint64_t.

Fixes commit 33f0c47b8fb4 ("tools: gpio: implement gpio-watch")
---
 tools/gpio/gpio-watch.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
tools/gpio/gpio-watch.c +3 -2
index f229ec62301b..41e76d244192 100644
@@ -10,6 +10,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <inttypes.h>
 #include <linux/gpio.h>
 #include <poll.h>
 #include <stdbool.h>
@@ -86,8 +87,8 @@ int main(int argc, char **argv)
 				return EXIT_FAILURE;
 			}
 
-			printf("line %u: %s at %llu\n",
-			       chg.info.offset, event, chg.timestamp_ns);
+			printf("line %u: %s at %" PRIu64 "\n",
+			       chg.info.offset, event, (uint64_t)chg.timestamp_ns);
 		}
 	}
 
Signature · 1 line
2.30.0
#3 lore raw
In reply to Kent Gibson
Quoted 14 lines · Kent Gibson

Fix a couple of warnings that I ran across while testing selftest changes.

Sorry about the repetition in the checkin comments, but as the problem was introduced to the two files separately it seemed more appropriate than tying their history together.

Cheers,
Kent.

Kent Gibson (2):
tools: gpio: fix %llu warning in gpio-event-mon.c
tools: gpio: fix %llu warning in gpio-watch.c

Quoted 7 lines
 tools/gpio/gpio-event-mon.c | 4 ++--
 tools/gpio/gpio-watch.c     | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

--
2.30.0

Applied both patches for fixes.

Thanks!
Bartosz