From: David Lamparter <equinox@diac24.net>
Date: Tue, 21 Jan 2020 14:02:41 +0000 (+0100)
Subject: bfdd: fix format strings
X-Git-Tag: base_7.4~392^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F5716%2Fhead;p=mirror%2Ffrr.git

bfdd: fix format strings

... now that we get warnings about them ...

Signed-off-by: David Lamparter <equinox@diac24.net>
---

diff --git a/bfdd/bfd_packet.c b/bfdd/bfd_packet.c
index 6da5e2cdf9..1ec761e3b8 100644
--- a/bfdd/bfd_packet.c
+++ b/bfdd/bfd_packet.c
@@ -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;
 	}
diff --git a/bfdd/config.c b/bfdd/config.c
index 0c0bac0aaa..dd4a192694 100644
--- a/bfdd/config.c
+++ b/bfdd/config.c
@@ -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);
diff --git a/bfdd/control.c b/bfdd/control.c
index 5c5421c041..cf821f45b8 100644
--- a/bfdd/control.c
+++ b/bfdd/control.c
@@ -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;