From ca81444303e3dc2cdcb65606b7e8e28fc3ba2a08 Mon Sep 17 00:00:00 2001 From: Davide Caratti Date: Thu, 7 Feb 2019 11:51:27 +0100 Subject: [PATCH] use print_{,h}hu instead of print_uint when format specifier is %{,h}hu in this way, a useless cast to unsigned int is avoided in bpf_print_ops() and print_tunnel(). Tested with: # ./tdc.py -c bpf Suggested-by: Stephen Hemminger Cc: Andrea Claudi Signed-off-by: Davide Caratti Signed-off-by: David Ahern --- ip/ipl2tp.c | 4 ++-- lib/bpf.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ip/ipl2tp.c b/ip/ipl2tp.c index f699b258..77bc3249 100644 --- a/ip/ipl2tp.c +++ b/ip/ipl2tp.c @@ -237,9 +237,9 @@ static void print_tunnel(const struct l2tp_data *data) print_string(PRINT_FP, NULL, " UDP source / dest ports:", NULL); - print_uint(PRINT_ANY, "local_port", " %hu", + print_hu(PRINT_ANY, "local_port", " %hu", p->local_udp_port); - print_uint(PRINT_ANY, "peer_port", "/%hu", + print_hu(PRINT_ANY, "peer_port", "/%hu", p->peer_udp_port); print_nl(); diff --git a/lib/bpf.c b/lib/bpf.c index dfc4f4f5..c7b3ee1e 100644 --- a/lib/bpf.c +++ b/lib/bpf.c @@ -353,9 +353,9 @@ void bpf_print_ops(struct rtattr *bpf_ops, __u16 len) for (i = 0; i < len; i++) { open_json_object(NULL); - print_uint(PRINT_ANY, "code", "%hu ", ops[i].code); - print_uint(PRINT_ANY, "jt", "%hhu ", ops[i].jt); - print_uint(PRINT_ANY, "jf", "%hhu ", ops[i].jf); + print_hu(PRINT_ANY, "code", "%hu ", ops[i].code); + print_hhu(PRINT_ANY, "jt", "%hhu ", ops[i].jt); + print_hhu(PRINT_ANY, "jf", "%hhu ", ops[i].jf); if (i == len - 1) print_uint(PRINT_ANY, "k", "%u\'", ops[i].k); else -- 2.39.2