]> git.puffer.fish Git - mirror/frr.git/commitdiff
bfdd: fix format strings 5716/head
authorDavid Lamparter <equinox@diac24.net>
Tue, 21 Jan 2020 14:02:41 +0000 (15:02 +0100)
committerDavid Lamparter <equinox@diac24.net>
Tue, 21 Jan 2020 15:35:00 +0000 (16:35 +0100)
... now that we get warnings about them ...

Signed-off-by: David Lamparter <equinox@diac24.net>
bfdd/bfd_packet.c
bfdd/config.c
bfdd/control.c

index 6da5e2cdf9efad3a4fd3030d6c0d903738a56032..1ec761e3b875bcffc24622df121a71de412d4806 100644 (file)
@@ -116,7 +116,7 @@ int _ptm_bfd_send(struct bfd_session *bs, uint16_t *port, const void *data,
                return -1;
        }
        if (rv < (ssize_t)datalen)
-               log_debug("packet-send: send partial", strerror(errno));
+               log_debug("packet-send: send partial: %s", strerror(errno));
 
        return 0;
 }
@@ -799,7 +799,7 @@ int bp_udp_send(int sd, uint8_t ttl, uint8_t *data, size_t datalen,
                log_debug("udp-send: loopback failure: (%d) %s", errno, strerror(errno));
                return -1;
        } else if (wlen < (ssize_t)datalen) {
-               log_debug("udp-send: partial send: %ld expected %ld", wlen,
+               log_debug("udp-send: partial send: %zd expected %zu", wlen,
                          datalen);
                return -1;
        }
index 0c0bac0aaa3150e99522cbf5be19c1ae26bb43d4..dd4a1926942bd66c41d618e825fbd448977d6d29 100644 (file)
@@ -215,7 +215,8 @@ static int parse_peer_config(struct json_object *jo, struct bfd_peer_cfg *bpc)
                        if (strlcpy(bpc->bpc_localif, sval,
                                    sizeof(bpc->bpc_localif))
                            > sizeof(bpc->bpc_localif)) {
-                               log_debug("\tlocal-interface: %s (truncated)");
+                               log_debug("\tlocal-interface: %s (truncated)",
+                                         sval);
                                error++;
                        } else {
                                log_debug("\tlocal-interface: %s", sval);
@@ -235,7 +236,7 @@ static int parse_peer_config(struct json_object *jo, struct bfd_peer_cfg *bpc)
                        bpc->bpc_detectmultiplier =
                                json_object_get_int64(jo_val);
                        bpc->bpc_has_detectmultiplier = true;
-                       log_debug("\tdetect-multiplier: %llu",
+                       log_debug("\tdetect-multiplier: %u",
                                  bpc->bpc_detectmultiplier);
                } else if (strcmp(key, "receive-interval") == 0) {
                        bpc->bpc_recvinterval = json_object_get_int64(jo_val);
index 5c5421c041057bba33cdea79b924b6b525225b93..cf821f45b88f472f81c1711fe4725a74ddc67486 100644 (file)
@@ -471,7 +471,7 @@ static int control_read(struct thread *t)
        bcb->bcb_buf = XMALLOC(MTYPE_BFDD_NOTIFICATION,
                               sizeof(bcm) + bcb->bcb_left + 1);
        if (bcb->bcb_buf == NULL) {
-               log_warning("%s: not enough memory for message size: %u",
+               log_warning("%s: not enough memory for message size: %zu",
                            __func__, bcb->bcb_left);
                control_free(bcs);
                return 0;