diff options
| author | David Lamparter <equinox@diac24.net> | 2020-07-14 12:02:54 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2020-07-14 12:02:54 +0200 |
| commit | 47b13e9bc0de0a7ee53aedb09b6bf33e63e4444c (patch) | |
| tree | 463d5ffa2bcfc1b1b9c91194d6e869f1c6e925f0 | |
| parent | *: remove PRI[udx](8|16|32) (diff) | |
| download | frr-47b13e9bc0de0a7ee53aedb09b6bf33e63e4444c.tar.xz frr-47b13e9bc0de0a7ee53aedb09b6bf33e63e4444c.zip | |
isisd: fix OpenBSD pedantic format warnings
constants are int-typed, so adding something to an uint8_t yields an
int. Nevermind the fact that varargs calling conventions require
upcasting everything smaller than an int to an int anyways...
Signed-off-by: David Lamparter <equinox@diac24.net>
| -rw-r--r-- | isisd/isis_pdu.c | 2 | ||||
| -rw-r--r-- | isisd/isis_tlvs.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c index 9a1ad38f8..72548e042 100644 --- a/isisd/isis_pdu.c +++ b/isisd/isis_pdu.c @@ -876,7 +876,7 @@ static int process_lsp(uint8_t pdu_type, struct isis_circuit *circuit, /* lsp is_type check */ if ((hdr.lsp_bits & IS_LEVEL_1) != IS_LEVEL_1) { zlog_debug( - "ISIS-Upd (%s): LSP %s invalid LSP is type 0x%hhx", + "ISIS-Upd (%s): LSP %s invalid LSP is type 0x%x", circuit->area->area_tag, rawlspid_print(hdr.lsp_id), hdr.lsp_bits & IS_LEVEL_1_AND_2); /* continue as per RFC1122 Be liberal in what you accept, and diff --git a/isisd/isis_tlvs.c b/isisd/isis_tlvs.c index e9b28489c..a1f9cc236 100644 --- a/isisd/isis_tlvs.c +++ b/isisd/isis_tlvs.c @@ -538,7 +538,7 @@ static int unpack_item_ext_subtlvs(uint16_t mtid, uint8_t len, struct stream *s, subtlv_type = stream_getc(s); subtlv_len = stream_getc(s); if (subtlv_len > len - sum) { - sbuf_push(log, indent, "TLV %hhu: Available data %hhu is less than TLV size %u !\n", + sbuf_push(log, indent, "TLV %hhu: Available data %u is less than TLV size %u !\n", subtlv_type, len - sum, subtlv_len); return 1; } @@ -1152,7 +1152,7 @@ static int unpack_item_area_address(uint16_t mtid, uint8_t len, rv->len = stream_getc(s); if (len < 1 + rv->len) { - sbuf_push(log, indent, "Not enough data left. (Expected %hhu bytes of address, got %hhu)\n", + sbuf_push(log, indent, "Not enough data left. (Expected %hhu bytes of address, got %u)\n", rv->len, len - 1); goto out; } @@ -1468,7 +1468,7 @@ static int unpack_item_extended_reach(uint16_t mtid, uint8_t len, if ((size_t)len < ((size_t)11) + subtlv_len) { sbuf_push(log, indent, - "Not enough data left for subtlv size %hhu, there are only %hhu bytes left.\n", + "Not enough data left for subtlv size %hhu, there are only %u bytes left.\n", subtlv_len, len - 11); goto out; } |