]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
iplink_can: add missing `]' of the bitrate, dbitrate and termination arrays
authorVincent Mailhol <mailhol.vincent@wanadoo.fr>
Mon, 10 Oct 2022 14:16:38 +0000 (23:16 +0900)
committerStephen Hemminger <stephen@networkplumber.org>
Tue, 18 Oct 2022 03:25:12 +0000 (20:25 -0700)
The command "ip --details link show canX" misses the closing bracket
`]' of the bitrate, the dbitrate and the termination arrays. The --json
output is not impacted.

Change the first argument of close_json_array() from PRINT_JSON to
PRINT_ANY to fix the problem. The second argument was already set
correctly.

Fixes: 67f3c7a5cc0d ("iplink_can: use PRINT_ANY to factorize code and fix signedness")
Reported-by: Marc Kleine-Budde <mkl@pengutronix.de>
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
ip/iplink_can.c

index 0e670a6ca27be7461cf4dd8dfbb6024497590584..9bbe3d95876bfa0034a9597d9b64caa8d39ccd7b 100644 (file)
@@ -519,7 +519,7 @@ static void can_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
                                   i < bitrate_cnt - 1 ? "%8u, " : "%8u",
                                   bitrate_const[i]);
                }
-               close_json_array(PRINT_JSON, " ]");
+               close_json_array(PRINT_ANY, " ]");
        }
 
        /* data bittiming is irrelevant if fixed bitrate is defined */
@@ -606,7 +606,7 @@ static void can_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
                                   i < dbitrate_cnt - 1 ? "%8u, " : "%8u",
                                   dbitrate_const[i]);
                }
-               close_json_array(PRINT_JSON, " ]");
+               close_json_array(PRINT_ANY, " ]");
        }
 
        if (tb[IFLA_CAN_TERMINATION_CONST] && tb[IFLA_CAN_TERMINATION]) {
@@ -623,7 +623,7 @@ static void can_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
                        print_hu(PRINT_ANY, NULL,
                                 i < trm_cnt - 1 ? "%hu, " : "%hu",
                                 trm_const[i]);
-               close_json_array(PRINT_JSON, " ]");
+               close_json_array(PRINT_ANY, " ]");
        }
 
        if (tb[IFLA_CAN_CLOCK]) {