vrrpd: Make clang 11 happy

Recent changes to remove PRIu... in commit:
6cde4b45528e52819c803de92d10d4be3abddf29

causes clang 11 to be unhappy, with length of field warnings.
Modify the offending code to compile properly using that compiler.
I've tested against clang 11 and gcc 9.3

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/vrrpd/vrrp.c b/vrrpd/vrrp.c
index 3e79cff3911bcccb378e668c9c6d4ec91dace0f1..d3f9b0c7303e5eb5cabf5d9a1ac58161b43d0eb6 100644 (file)
--- a/vrrpd/vrrp.c
+++ b/vrrpd/vrrp.c
@@ -2351,7 +2351,7 @@ int vrrp_config_write_global(struct vty *vty)
 
        if (vd.advertisement_interval != VRRP_DEFAULT_ADVINT && ++writes)
                vty_out(vty,
-                       "vrrp default advertisement-interval %hu\n",
+                       "vrrp default advertisement-interval %u\n",
                        vd.advertisement_interval * CS2MS);
 
        if (vd.preempt_mode != VRRP_DEFAULT_PREEMPT && ++writes)
@@ -2374,7 +2374,7 @@ static unsigned int vrrp_hash_key(const void *arg)
        const struct vrrp_vrouter *vr = arg;
        char key[IFNAMSIZ + 64];
 
-       snprintf(key, sizeof(key), "%s@%hhu", vr->ifp->name, vr->vrid);
+       snprintf(key, sizeof(key), "%s@%u", vr->ifp->name, vr->vrid);
 
        return string_hash_make(key);
 }

diff --git a/vrrpd/vrrp_packet.c b/vrrpd/vrrp_packet.c
index 61fcc4e85dad14792a9f07443c0acc783c12a997..3cb13bd71b138a09c05d004cc3d5ca3978415aa2 100644 (file)
--- a/vrrpd/vrrp_packet.c
+++ b/vrrpd/vrrp_packet.c
@@ -296,7 +296,7 @@ ssize_t vrrp_pkt_parse_datagram(int family, int version, struct msghdr *m,
                        (*pkt)->hdr.chksum, chksum);
 
        /* Type check */
-       VRRP_PKT_VCHECK(((*pkt)->hdr.vertype & 0x0F) == 1, "Bad type %hhu",
+       VRRP_PKT_VCHECK(((*pkt)->hdr.vertype & 0x0F) == 1, "Bad type %u",
                        (*pkt)->hdr.vertype & 0x0f);
 
        /* Exact size check */

diff --git a/vrrpd/vrrp_vty.c b/vrrpd/vrrp_vty.c
index 1a123370860e2af65959fb7cea4af43134b755d3..dc7f023e8f43410fbc5e1caba9461718894aff53 100644 (file)
--- a/vrrpd/vrrp_vty.c
+++ b/vrrpd/vrrp_vty.c
@@ -653,7 +653,7 @@ DEFPY(vrrp_vrid_show_summary,
                        continue;
 
                ttable_add_row(
-                       tt, "%s|%hhu|%hhu|%d|%d|%s|%s",
+                       tt, "%s|%u|%hhu|%d|%d|%s|%s",
                        vr->ifp->name, vr->vrid, vr->priority,
                        vr->v4->addrs->count, vr->v6->addrs->count,
                        vr->v4->fsm.state == VRRP_STATE_MASTER ? "Master"