2021-01-07 04:03:44

by Kent Gibson

Subject: [PATCH 0/2] 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(-)

--
2.30.0

2021-01-07 04:04:43

by Kent Gibson

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

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")
Signed-off-by: Kent Gibson <[email protected]>
---
tools/gpio/gpio-watch.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/gpio/gpio-watch.c b/tools/gpio/gpio-watch.c
index f229ec62301b..41e76d244192 100644
--- a/tools/gpio/gpio-watch.c
+++ b/tools/gpio/gpio-watch.c
@@ -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);
}
}

--
2.30.0

2021-01-11 10:03:18

by Bartosz Golaszewski

Subject: Re: [PATCH 0/2] tools: gpio: fix %llu warnings

On Thu, Jan 7, 2021 at 5:00 AM Kent Gibson <[email protected]> wrote:
>
> 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(-)
>
> --
> 2.30.0
>

Applied both patches for fixes.

Thanks!
Bartosz