aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Poirier <bpoirier@nvidia.com>2023-12-11 09:07:19 -0500
committerStephen Hemminger <stephen@networkplumber.org>2023-12-22 09:54:23 -0800
commit0b8508f44d8554cf80ef92a745c8be813b99fccb (patch)
tree8633d9e90655863618f43bfa5831895397f262ea
parentcf7b528a21f67d5ef1ef1d9943bddc325255f6a4 (diff)
downloadiproute2-next-0b8508f44d8554cf80ef92a745c8be813b99fccb.tar.gz
bridge: vlan: Remove paranoid check
To make the code lighter, remove the check on the actual print_range() output width. In the odd case that an out-of-range, wide vlan id is printed, printf() will treat the negative field width as positive and the output will simply be further misaligned. Suggested-by: Petr Machata <petrm@nvidia.com> Reviewed-by: Petr Machata <petrm@nvidia.com> Tested-by: Petr Machata <petrm@nvidia.com> Signed-off-by: Benjamin Poirier <bpoirier@nvidia.com> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
-rw-r--r--bridge/vlan.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/bridge/vlan.c b/bridge/vlan.c
index 797b7802a..7a175b047 100644
--- a/bridge/vlan.c
+++ b/bridge/vlan.c
@@ -661,13 +661,8 @@ static void print_vlan_tunnel_info(struct rtattr *tb, int ifindex)
open_json_object(NULL);
width = print_range("vlan", last_vid_start, tunnel_vid);
- if (width <= VLAN_ID_LEN) {
- if (!is_json_context())
- printf("%-*s ", VLAN_ID_LEN - width, "");
- } else {
- fprintf(stderr, "BUG: vlan range too wide, %u\n",
- width);
- }
+ if (!is_json_context())
+ printf("%-*s ", VLAN_ID_LEN - width, "");
print_range("tunid", last_tunid_start, tunnel_id);
close_json_object();
print_nl();