diff options
| author |   Benoît Ganne <bganne@cisco.com> | 2023-04-17 14:50:00 +0200 |
|---|---|---|
| committer |   Damjan Marion <dmarion@0xa5.net> | 2023-05-16 09:27:41 +0000 |
| commit | 00c37199d7a784b627a9017c4533a3ca240b9c6d (patch) | |
| tree | fed97f585af402ab65356133c88cc3aac2e4bf90 | |
| parent | 24d7e72aa5aecc46d6871767b75a7f8ca9f545c0 (diff) | |
misc: make format_hexdump length u32
format_hexdump currently requires the length parameter to be uword
(64-bits) hence all callers must make sure to cast the length to uword.
Use u32 instead to benefit from C automatic integer promotion: any
length smaller or equal to u32 will be promoted to int fitting in u32).
Only callers using a length of u64 needs to downcast.
It also makes it similar to other variants.
Type: fix
Change-Id: I09b52fdde3970cec0be4150a29126ff63106c75b
Signed-off-by: Benoît Ganne <bganne@cisco.com>
| -rw-r--r-- | src/plugins/rdma/format.c | 5 | ||||
| -rw-r--r-- | src/vppinfra/std-formats.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/rdma/format.c b/src/plugins/rdma/format.c index b477c115405..78187e9cf17 100644 --- a/src/plugins/rdma/format.c +++ b/src/plugins/rdma/format.c @@ -292,9 +292,8 @@ format_rdma_rxq (u8 * s, va_list * args) next_cqe_index); s = format (s, "\n%U%U", format_white_space, indent + 6, format_mlx5_cqe_rx, rxq->cqes + next_cqe_index); - s = format (s, "\n%U%U", format_white_space, indent + 6, - format_hexdump, rxq->cqes + next_cqe_index, - sizeof (mlx5dv_cqe_t)); + s = format (s, "\n%U%U", format_white_space, indent + 6, format_hexdump, + rxq->cqes + next_cqe_index, (u32) sizeof (mlx5dv_cqe_t)); } return s; diff --git a/src/vppinfra/std-formats.c b/src/vppinfra/std-formats.c index 7a51a531d31..cb2872ad24b 100644 --- a/src/vppinfra/std-formats.c +++ b/src/vppinfra/std-formats.c @@ -414,7 +414,7 @@ __clib_export u8 * format_hexdump (u8 * s, va_list * args) { u8 *data = va_arg (*args, u8 *); - uword len = va_arg (*args, uword); + u32 len = va_arg (*args, u32); int i, index = 0; const int line_len = 16; u8 *line_hex = 0; |