* [PATCH iproute2 v2 1/2] devlink: fix format string warning for 32bit targets
@ 2019-06-27 18:37 Baruch Siach
2019-06-27 18:37 ` [PATCH iproute2 v2 2/2] devlink: fix libc and kernel headers collision Baruch Siach
2019-06-28 22:21 ` [PATCH iproute2 v2 1/2] devlink: fix format string warning for 32bit targets Stephen Hemminger
0 siblings, 2 replies; 3+ messages in thread
From: Baruch Siach @ 2019-06-27 18:37 UTC (permalink / raw)
To: Stephen Hemminger, Jiri Pirko
Cc: netdev, Baruch Siach, Aya Levin, Moshe Shemesh
32bit targets define uint64_t as long long unsigned. This leads to the
following build warning:
devlink.c: In function ‘pr_out_u64’:
devlink.c:1729:11: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 4 has type ‘uint64_t {aka long long unsigned int}’ [-Wformat=]
pr_out("%s %lu", name, val);
^
devlink.c:59:21: note: in definition of macro ‘pr_out’
fprintf(stdout, ##args); \
^~~~
Use uint64_t specific conversion specifiers in the format string to fix
that.
Cc: Aya Levin <ayal@mellanox.com>
Cc: Moshe Shemesh <moshe@mellanox.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
v2: Use inttypes.h conversion specifiers
---
devlink/devlink.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/devlink/devlink.c b/devlink/devlink.c
index 436935f88bda..b6e68f9a4d65 100644
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -1726,9 +1726,9 @@ static void pr_out_u64(struct dl *dl, const char *name, uint64_t val)
jsonw_u64_field(dl->jw, name, val);
} else {
if (g_indent_newline)
- pr_out("%s %lu", name, val);
+ pr_out("%s %"PRIu64, name, val);
else
- pr_out(" %s %lu", name, val);
+ pr_out(" %s %"PRIu64, name, val);
}
}
@@ -1753,7 +1753,7 @@ static void pr_out_uint64_value(struct dl *dl, uint64_t value)
if (dl->json_output)
jsonw_u64(dl->jw, value);
else
- pr_out(" %lu", value);
+ pr_out(" %"PRIu64, value);
}
static void pr_out_binary_value(struct dl *dl, uint8_t *data, uint32_t len)
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH iproute2 v2 2/2] devlink: fix libc and kernel headers collision
2019-06-27 18:37 [PATCH iproute2 v2 1/2] devlink: fix format string warning for 32bit targets Baruch Siach
@ 2019-06-27 18:37 ` Baruch Siach
2019-06-28 22:21 ` [PATCH iproute2 v2 1/2] devlink: fix format string warning for 32bit targets Stephen Hemminger
1 sibling, 0 replies; 3+ messages in thread
From: Baruch Siach @ 2019-06-27 18:37 UTC (permalink / raw)
To: Stephen Hemminger, Jiri Pirko
Cc: netdev, Baruch Siach, Aya Levin, Moshe Shemesh
Since commit 2f1242efe9d ("devlink: Add devlink health show command") we
use the sys/sysinfo.h header for the sysinfo(2) system call. But since
iproute2 carries a local version of the kernel struct sysinfo, this
causes a collision with libc that do not rely on kernel defined sysinfo
like musl libc:
In file included from devlink.c:25:0:
.../sysroot/usr/include/sys/sysinfo.h:10:8: error: redefinition of 'struct sysinfo'
struct sysinfo {
^~~~~~~
In file included from ../include/uapi/linux/kernel.h:5:0,
from ../include/uapi/linux/netlink.h:5,
from ../include/uapi/linux/genetlink.h:6,
from devlink.c:21:
../include/uapi/linux/sysinfo.h:8:8: note: originally defined here
struct sysinfo {
^~~~~~~
Move the sys/sysinfo.h userspace header before kernel headers, and
suppress the indirect include of linux/sysinfo.h.
Cc: Aya Levin <ayal@mellanox.com>
Cc: Moshe Shemesh <moshe@mellanox.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
v2: Shorten comment
---
devlink/devlink.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/devlink/devlink.c b/devlink/devlink.c
index b6e68f9a4d65..039225df7cbf 100644
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -18,11 +18,12 @@
#include <limits.h>
#include <errno.h>
#include <inttypes.h>
+#include <sys/sysinfo.h>
+#define _LINUX_SYSINFO_H /* avoid collision with musl header */
#include <linux/genetlink.h>
#include <linux/devlink.h>
#include <libmnl/libmnl.h>
#include <netinet/ether.h>
-#include <sys/sysinfo.h>
#include <sys/queue.h>
#include "SNAPSHOT.h"
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH iproute2 v2 1/2] devlink: fix format string warning for 32bit targets
2019-06-27 18:37 [PATCH iproute2 v2 1/2] devlink: fix format string warning for 32bit targets Baruch Siach
2019-06-27 18:37 ` [PATCH iproute2 v2 2/2] devlink: fix libc and kernel headers collision Baruch Siach
@ 2019-06-28 22:21 ` Stephen Hemminger
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Hemminger @ 2019-06-28 22:21 UTC (permalink / raw)
To: Baruch Siach; +Cc: Jiri Pirko, netdev, Aya Levin, Moshe Shemesh
On Thu, 27 Jun 2019 21:37:18 +0300
Baruch Siach <baruch@tkos.co.il> wrote:
> 32bit targets define uint64_t as long long unsigned. This leads to the
> following build warning:
>
> devlink.c: In function ‘pr_out_u64’:
> devlink.c:1729:11: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 4 has type ‘uint64_t {aka long long unsigned int}’ [-Wformat=]
> pr_out("%s %lu", name, val);
> ^
> devlink.c:59:21: note: in definition of macro ‘pr_out’
> fprintf(stdout, ##args); \
> ^~~~
>
> Use uint64_t specific conversion specifiers in the format string to fix
> that.
>
> Cc: Aya Levin <ayal@mellanox.com>
> Cc: Moshe Shemesh <moshe@mellanox.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Both patches applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-06-28 22:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-27 18:37 [PATCH iproute2 v2 1/2] devlink: fix format string warning for 32bit targets Baruch Siach
2019-06-27 18:37 ` [PATCH iproute2 v2 2/2] devlink: fix libc and kernel headers collision Baruch Siach
2019-06-28 22:21 ` [PATCH iproute2 v2 1/2] devlink: fix format string warning for 32bit targets Stephen Hemminger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).