matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

isisd: fix OpenBSD pedantic format warnings

Browse source 
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>
This commit is contained in:
David Lamparter 2020-07-14 12:02:54 +02:00
parent 6cde4b4552
commit 47b13e9bc0
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
isisd/isis_pdu.c
View file

@ -876,7 +876,7 @@ static int process_lsp(uint8_t pdu_type, struct isis_circuit *circuit,
/* lsp is_type check */ /* lsp is_type check */
if ((hdr.lsp_bits & IS_LEVEL_1) != IS_LEVEL_1) { if ((hdr.lsp_bits & IS_LEVEL_1) != IS_LEVEL_1) {
zlog_debug( 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), circuit->area->area_tag, rawlspid_print(hdr.lsp_id),
hdr.lsp_bits & IS_LEVEL_1_AND_2); hdr.lsp_bits & IS_LEVEL_1_AND_2);
/* continue as per RFC1122 Be liberal in what you accept, and /* continue as per RFC1122 Be liberal in what you accept, and

6
isisd/isis_tlvs.c
View file

@ -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_type = stream_getc(s);
subtlv_len = stream_getc(s); subtlv_len = stream_getc(s);
if (subtlv_len > len - sum) { 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); subtlv_type, len - sum, subtlv_len);
return 1; return 1;
} }
@ -1152,7 +1152,7 @@ static int unpack_item_area_address(uint16_t mtid, uint8_t len,
rv->len = stream_getc(s); rv->len = stream_getc(s);
if (len < 1 + rv->len) { 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); rv->len, len - 1);
goto out; 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) { if ((size_t)len < ((size_t)11) + subtlv_len) {
sbuf_push(log, indent, 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); subtlv_len, len - 11);
goto out; goto out;
} }