From: Jesse Gross <jesse@nicira.com>
Date: Sun, 12 Dec 2010 06:53:34 +0000 (-0800)
Subject: nx-match: Use correct printf format specifiers.
X-Git-Tag: v1.1.0~642
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e5fccb40da338a68fd6360e4de1d65a526c9d1d1;p=sliver-openvswitch.git

nx-match: Use correct printf format specifiers.

A few of the printf format specifiers didn't match the type that
they were printing.  On 32-bit platforms there is some overlap
but on 64-bit they cause a mismatch.
---

diff --git a/lib/nx-match.c b/lib/nx-match.c
index 764ec61d2..c1d8fa84e 100644
--- a/lib/nx-match.c
+++ b/lib/nx-match.c
@@ -395,7 +395,7 @@ nx_pull_match(struct ofpbuf *b, unsigned int match_len, uint16_t priority,
 
     p = ofpbuf_try_pull(b, ROUND_UP(match_len, 8));
     if (!p) {
-        VLOG_DBG_RL(&rl, "nx_match length %zu, rounded up to a "
+        VLOG_DBG_RL(&rl, "nx_match length %u, rounded up to a "
                     "multiple of 8, is longer than space in message (max "
                     "length %zu)", match_len, b->size);
         return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN);
@@ -921,7 +921,7 @@ nxm_parse_reg_load(struct nx_action_reg_load *load, const char *s)
     }
 
     if (n_bits < 64 && (value >> n_bits) != 0) {
-        ovs_fatal(0, "%s: value %llu does not fit into %d bits",
+        ovs_fatal(0, "%s: value %"PRIu64" does not fit into %d bits",
                   full_s, value, n_bits);
     }