This fixes four warnings of the following form on i386 and other 32-bit
architectures:
warning: format '%ld' expects argument of type 'long int', but
argument 2 has type 'unsigned int' [-Wformat]
Signed-off-by: Ben Pfaff <[email protected]>
---
Makefile.am | 2 +-
datapath/datapath.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index b5d33ac..e7c7bac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -207,7 +207,7 @@ config-h-check:
ALL_LOCAL += printf-check
printf-check:
@if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1 && \
- git --no-pager grep -n -E -e '%[-+ #0-9.*]*([ztj]|hh)' --and --not
-e 'ovs_scan' `git ls-files $(srcdir) | grep '\.[ch]$$'`; \
+ git --no-pager grep -n -E -e '%[-+ #0-9.*]*([ztj]|hh)' --and --not
-e 'ovs_scan' `git ls-files $(srcdir) | grep -v /datapath/ | grep '\.[ch]$$'`; \
then \
echo "See above for list of violations of the rule that"; \
echo "'z', 't', 'j', 'hh' printf() type modifiers are"; \
diff --git a/datapath/datapath.c b/datapath/datapath.c
index 1efbb00..5bdf2ba 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007-2013 Nicira, Inc.
+ * Copyright (c) 2007-2014 Nicira, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
@@ -1922,7 +1922,7 @@ static int __init dp_init(void)
pr_info("Open vSwitch switching datapath %s, built "__DATE__"
"__TIME__"\n",
VERSION);
- pr_info("Datapath sw_flow_key size: %ld bytes. ip.frag at %ld, tp.flags
at %ld, ipv4.addr at %ld\n",
+ pr_info("Datapath sw_flow_key size: %zu bytes. ip.frag at %zu, tp.flags
at %zu, ipv4.addr at %zu\n",
sizeof(struct sw_flow_key),
offsetof(struct sw_flow_key, ip.frag),
offsetof(struct sw_flow_key, tp.flags),
--
1.7.10.4
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
