proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 09:22:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bfdd: fix format strings

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

Signed-off-by: David Lamparter <equinox@diac24.net>
This commit is contained in:
David Lamparter 2020-01-21 15:02:41 +01:00
parent d85b048d48
commit b7b3d466eb
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bfdd/bfd_packet.c
View File

@ -116,7 +116,7 @@ int _ptm_bfd_send(struct bfd_session *bs, uint16_t *port, const void *data,
return -1; return -1;
} }
if (rv < (ssize_t)datalen) if (rv < (ssize_t)datalen)
log_debug("packet-send: send partial", strerror(errno)); log_debug("packet-send: send partial: %s", strerror(errno));
return 0; 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)); log_debug("udp-send: loopback failure: (%d) %s", errno, strerror(errno));
return -1; return -1;
} else if (wlen < (ssize_t)datalen) { } 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); datalen);
return -1; return -1;
} }

5
bfdd/config.c
View 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, if (strlcpy(bpc->bpc_localif, sval,
sizeof(bpc->bpc_localif)) sizeof(bpc->bpc_localif))
> sizeof(bpc->bpc_localif)) { > sizeof(bpc->bpc_localif)) {
log_debug("\tlocal-interface: %s (truncated)"); log_debug("\tlocal-interface: %s (truncated)",
sval);
error++; error++;
} else { } else {
log_debug("\tlocal-interface: %s", sval); 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 = bpc->bpc_detectmultiplier =
json_object_get_int64(jo_val); json_object_get_int64(jo_val);
bpc->bpc_has_detectmultiplier = true; bpc->bpc_has_detectmultiplier = true;
log_debug("\tdetect-multiplier: %llu", log_debug("\tdetect-multiplier: %u",
bpc->bpc_detectmultiplier); bpc->bpc_detectmultiplier);
} else if (strcmp(key, "receive-interval") == 0) { } else if (strcmp(key, "receive-interval") == 0) {
bpc->bpc_recvinterval = json_object_get_int64(jo_val); bpc->bpc_recvinterval = json_object_get_int64(jo_val);

2
bfdd/control.c
View File

@ -471,7 +471,7 @@ static int control_read(struct thread *t)
bcb->bcb_buf = XMALLOC(MTYPE_BFDD_NOTIFICATION, bcb->bcb_buf = XMALLOC(MTYPE_BFDD_NOTIFICATION,
sizeof(bcm) + bcb->bcb_left + 1); sizeof(bcm) + bcb->bcb_left + 1);
if (bcb->bcb_buf == NULL) { 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); __func__, bcb->bcb_left);
control_free(bcs); control_free(bcs);
return 0; return 0;