diff mbox series

[iproute2-next,07/20] bridge: vlan: Remove paranoid check

Message ID 20231211140732.11475-8-bpoirier@nvidia.com (mailing list archive)
State Accepted
Commit 0b8508f44d8554cf80ef92a745c8be813b99fccb
Delegated to: Stephen Hemminger
Headers show
Series bridge: vni: UI fixes | expand

Checks

Context Check Description
netdev/tree_selection success Not a local patch

Commit Message

Benjamin Poirier Dec. 11, 2023, 2:07 p.m. UTC 
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>
---
 bridge/vlan.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

Comments

Stephen Hemminger Dec. 21, 2023, 4:04 a.m. UTC | #1 
On Mon, 11 Dec 2023 09:07:19 -0500
Benjamin Poirier <bpoirier@nvidia.com> wrote:

> 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>

Why truncate the output anyway?
diff mbox series

Patch

diff --git a/bridge/vlan.c b/bridge/vlan.c
index 797b7802..7a175b04 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();