matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iplink_can: code refactoring of print_ctrlmode() 

This patch only does cleanup and do not introduce any functional
changes.

We do some code refactoring of print_ctrlmode() in prevision of the
upcoming patch:

  - remove the first argument of print_ctrlmode(). It is a pointer to
    FILE and is never used.

  - add a new function argument: enum output_type t in order to
    specify the output type (i.e. PRINT_{FP,JSON,ANY}).

  - add a new function argument: const char *key in order to specify
    the name of the json array (e.g. "ctrlmode").

  - replace the _PF() macro with the print_flag() function to increase
    readability.

  - directly return if none of the flags are set (previously, this
    check was done before calling the function).

Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Signed-off-by: David Ahern <dsahern@kernel.org>
This commit is contained in:
Vincent Mailhol 2021-11-04 01:44:25 +09:00 committed by David Ahern
parent 8316df6e6d
commit fd5e958c49
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ip/iplink_can.c
View File

@ -88,34 +88,43 @@ static void set_ctrlmode(char *name, char *arg,
cm->mask |= flags; cm->mask |= flags;
} }
static void print_ctrlmode(FILE *f, __u32 cm) static void print_flag(enum output_type t, __u32 *flags, __u32 flag,
const char* name)
{ {
open_json_array(PRINT_ANY, is_json_context() ? "ctrlmode" : "<"); if (*flags & flag) {
#define _PF(cmflag, cmname) \ *flags &= ~flag;
if (cm & cmflag) { \ print_string(t, NULL, *flags ? "%s," : "%s", name);
cm &= ~cmflag; \
print_string(PRINT_ANY, NULL, cm ? "%s," : "%s", cmname); \
} }
_PF(CAN_CTRLMODE_LOOPBACK, "LOOPBACK"); }
_PF(CAN_CTRLMODE_LISTENONLY, "LISTEN-ONLY");
_PF(CAN_CTRLMODE_3_SAMPLES, "TRIPLE-SAMPLING"); static void print_ctrlmode(enum output_type t, __u32 flags, const char* key)
_PF(CAN_CTRLMODE_ONE_SHOT, "ONE-SHOT"); {
_PF(CAN_CTRLMODE_BERR_REPORTING, "BERR-REPORTING"); if (!flags)
_PF(CAN_CTRLMODE_FD, "FD"); return;
_PF(CAN_CTRLMODE_FD_NON_ISO, "FD-NON-ISO");
_PF(CAN_CTRLMODE_PRESUME_ACK, "PRESUME-ACK"); open_json_array(t, is_json_context() ? key : "<");
_PF(CAN_CTRLMODE_CC_LEN8_DLC, "CC-LEN8-DLC");
#undef _PF print_flag(t, &flags, CAN_CTRLMODE_LOOPBACK, "LOOPBACK");
if (cm) print_flag(t, &flags, CAN_CTRLMODE_LISTENONLY, "LISTEN-ONLY");
print_hex(PRINT_ANY, NULL, "%x", cm); print_flag(t, &flags, CAN_CTRLMODE_3_SAMPLES, "TRIPLE-SAMPLING");
close_json_array(PRINT_ANY, "> "); print_flag(t, &flags, CAN_CTRLMODE_ONE_SHOT, "ONE-SHOT");
print_flag(t, &flags, CAN_CTRLMODE_BERR_REPORTING, "BERR-REPORTING");
print_flag(t, &flags, CAN_CTRLMODE_FD, "FD");
print_flag(t, &flags, CAN_CTRLMODE_FD_NON_ISO, "FD-NON-ISO");
print_flag(t, &flags, CAN_CTRLMODE_PRESUME_ACK, "PRESUME-ACK");
print_flag(t, &flags, CAN_CTRLMODE_CC_LEN8_DLC, "CC-LEN8-DLC");
if (flags)
print_hex(t, NULL, "%x", flags);
close_json_array(t, "> ");
} }
static int can_parse_opt(struct link_util *lu, int argc, char **argv, static int can_parse_opt(struct link_util *lu, int argc, char **argv,
struct nlmsghdr *n) struct nlmsghdr *n)
{ {
struct can_bittiming bt = {}, dbt = {}; struct can_bittiming bt = {}, dbt = {};
struct can_ctrlmode cm = {0, 0}; struct can_ctrlmode cm = { 0 };
while (argc > 0) { while (argc > 0) {
if (matches(*argv, "bitrate") == 0) { if (matches(*argv, "bitrate") == 0) {
@ -282,8 +291,7 @@ static void can_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
if (tb[IFLA_CAN_CTRLMODE]) { if (tb[IFLA_CAN_CTRLMODE]) {
struct can_ctrlmode *cm = RTA_DATA(tb[IFLA_CAN_CTRLMODE]); struct can_ctrlmode *cm = RTA_DATA(tb[IFLA_CAN_CTRLMODE]);
if (cm->flags) print_ctrlmode(PRINT_ANY, cm->flags, "ctrlmode");
print_ctrlmode(f, cm->flags);
} }
if (tb[IFLA_CAN_STATE]) { if (tb[IFLA_CAN_STATE]) {