proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-10-04 14:24:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace open-coded instances of print_nl()

Browse Source 
Signed-off-by: Benjamin Poirier <bpoirier@cumulusnetworks.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Benjamin Poirier 2020-05-01 17:47:20 +09:00 committed by Stephen Hemminger
parent e0c457b1a5
commit 0501fe734f
12 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bridge/vlan.c
View File

@ -360,7 +360,7 @@ static void print_vlan_tunnel_info(struct rtattr *tb, int ifindex)
} }
print_range("tunid", last_tunid_start, tunnel_id); print_range("tunid", last_tunid_start, tunnel_id);
close_json_object(); close_json_object();
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
} }
if (opened) if (opened)
@ -644,7 +644,7 @@ void print_vlan_info(struct rtattr *tb, int ifindex)
print_vlan_flags(vinfo->flags); print_vlan_flags(vinfo->flags);
close_json_object(); close_json_object();
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
} }
if (opened) if (opened)

14
tc/m_action.c
View File

@ -177,7 +177,7 @@ static void print_hw_stats(const struct rtattr *arg, bool print_used)
print_string(PRINT_ANY, NULL, " %s", item->str); print_string(PRINT_ANY, NULL, " %s", item->str);
} }
close_json_array(PRINT_JSON, NULL); close_json_array(PRINT_JSON, NULL);
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
} }
static int parse_hw_stats(const char *str, struct nlmsghdr *n) static int parse_hw_stats(const char *str, struct nlmsghdr *n)
@ -376,11 +376,11 @@ static int tc_print_one_action(FILE *f, struct rtattr *arg)
if (show_stats && tb[TCA_ACT_STATS]) { if (show_stats && tb[TCA_ACT_STATS]) {
print_string(PRINT_FP, NULL, "\tAction statistics:", NULL); print_string(PRINT_FP, NULL, "\tAction statistics:", NULL);
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
open_json_object("stats"); open_json_object("stats");
print_tcstats2_attr(f, tb[TCA_ACT_STATS], "\t", NULL); print_tcstats2_attr(f, tb[TCA_ACT_STATS], "\t", NULL);
close_json_object(); close_json_object();
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
} }
if (tb[TCA_ACT_COOKIE]) { if (tb[TCA_ACT_COOKIE]) {
int strsz = RTA_PAYLOAD(tb[TCA_ACT_COOKIE]); int strsz = RTA_PAYLOAD(tb[TCA_ACT_COOKIE]);
@ -389,7 +389,7 @@ static int tc_print_one_action(FILE *f, struct rtattr *arg)
print_string(PRINT_ANY, "cookie", "\tcookie %s", print_string(PRINT_ANY, "cookie", "\tcookie %s",
hexstring_n2a(RTA_DATA(tb[TCA_ACT_COOKIE]), hexstring_n2a(RTA_DATA(tb[TCA_ACT_COOKIE]),
strsz, b1, sizeof(b1))); strsz, b1, sizeof(b1)));
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
} }
if (tb[TCA_ACT_FLAGS]) { if (tb[TCA_ACT_FLAGS]) {
struct nla_bitfield32 *flags = RTA_DATA(tb[TCA_ACT_FLAGS]); struct nla_bitfield32 *flags = RTA_DATA(tb[TCA_ACT_FLAGS]);
@ -398,7 +398,7 @@ static int tc_print_one_action(FILE *f, struct rtattr *arg)
print_bool(PRINT_ANY, "no_percpu", "\tno_percpu", print_bool(PRINT_ANY, "no_percpu", "\tno_percpu",
flags->value & flags->value &
TCA_ACT_FLAGS_NO_PERCPU_STATS); TCA_ACT_FLAGS_NO_PERCPU_STATS);
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
} }
if (tb[TCA_ACT_HW_STATS]) if (tb[TCA_ACT_HW_STATS])
print_hw_stats(tb[TCA_ACT_HW_STATS], false); print_hw_stats(tb[TCA_ACT_HW_STATS], false);
@ -458,7 +458,7 @@ tc_print_action(FILE *f, const struct rtattr *arg, unsigned short tot_acts)
for (i = 0; i <= tot_acts; i++) { for (i = 0; i <= tot_acts; i++) {
if (tb[i]) { if (tb[i]) {
open_json_object(NULL); open_json_object(NULL);
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
print_uint(PRINT_ANY, "order", print_uint(PRINT_ANY, "order",
"\taction order %u: ", i); "\taction order %u: ", i);
if (tc_print_one_action(f, tb[i]) < 0) { if (tc_print_one_action(f, tb[i]) < 0) {
@ -497,7 +497,7 @@ int print_action(struct nlmsghdr *n, void *arg)
open_json_object(NULL); open_json_object(NULL);
print_uint(PRINT_ANY, "total acts", "total acts %u", print_uint(PRINT_ANY, "total acts", "total acts %u",
tot_acts ? *tot_acts : 0); tot_acts ? *tot_acts : 0);
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
close_json_object(); close_json_object();
if (tb[TCA_ACT_TAB] == NULL) { if (tb[TCA_ACT_TAB] == NULL) {
if (n->nlmsg_type != RTM_GETACTION) if (n->nlmsg_type != RTM_GETACTION)

4
tc/m_connmark.c
View File

@ -125,7 +125,7 @@ static int print_connmark(struct action_util *au, FILE *f, struct rtattr *arg)
print_uint(PRINT_ANY, "zone", "zone %u", ci->zone); print_uint(PRINT_ANY, "zone", "zone %u", ci->zone);
print_action_control(f, " ", ci->action, ""); print_action_control(f, " ", ci->action, "");
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
print_uint(PRINT_ANY, "index", "\t index %u", ci->index); print_uint(PRINT_ANY, "index", "\t index %u", ci->index);
print_int(PRINT_ANY, "ref", " ref %d", ci->refcnt); print_int(PRINT_ANY, "ref", " ref %d", ci->refcnt);
print_int(PRINT_ANY, "bind", " bind %d", ci->bindcnt); print_int(PRINT_ANY, "bind", " bind %d", ci->bindcnt);
@ -137,7 +137,7 @@ static int print_connmark(struct action_util *au, FILE *f, struct rtattr *arg)
print_tm(f, tm); print_tm(f, tm);
} }
} }
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
return 0; return 0;
} }

4
tc/m_ctinfo.c
View File

@ -238,7 +238,7 @@ static int print_ctinfo(struct action_util *au, FILE *f, struct rtattr *arg)
print_hu(PRINT_ANY, "zone", "zone %u", zone); print_hu(PRINT_ANY, "zone", "zone %u", zone);
print_action_control(f, " ", ci->action, ""); print_action_control(f, " ", ci->action, "");
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
print_uint(PRINT_ANY, "index", "\t index %u", ci->index); print_uint(PRINT_ANY, "index", "\t index %u", ci->index);
print_int(PRINT_ANY, "ref", " ref %d", ci->refcnt); print_int(PRINT_ANY, "ref", " ref %d", ci->refcnt);
print_int(PRINT_ANY, "bind", " bind %d", ci->bindcnt); print_int(PRINT_ANY, "bind", " bind %d", ci->bindcnt);
@ -256,7 +256,7 @@ static int print_ctinfo(struct action_util *au, FILE *f, struct rtattr *arg)
if (show_stats) if (show_stats)
print_ctinfo_stats(f, tb); print_ctinfo_stats(f, tb);
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
return 0; return 0;
} }

4
tc/m_ife.c
View File

@ -311,7 +311,7 @@ static int print_ife(struct action_util *au, FILE *f, struct rtattr *arg)
sizeof(b2))); sizeof(b2)));
} }
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
print_uint(PRINT_ANY, "index", "\t index %u", p->index); print_uint(PRINT_ANY, "index", "\t index %u", p->index);
print_int(PRINT_ANY, "ref", " ref %d", p->refcnt); print_int(PRINT_ANY, "ref", " ref %d", p->refcnt);
print_int(PRINT_ANY, "bind", " bind %d", p->bindcnt); print_int(PRINT_ANY, "bind", " bind %d", p->bindcnt);
@ -324,7 +324,7 @@ static int print_ife(struct action_util *au, FILE *f, struct rtattr *arg)
} }
} }
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
return 0; return 0;
} }

2
tc/m_mpls.c
View File

@ -265,7 +265,7 @@ static int print_mpls(struct action_util *au, FILE *f, struct rtattr *arg)
} }
} }
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
return 0; return 0;
} }

4
tc/m_nat.c
View File

@ -172,7 +172,7 @@ print_nat(struct action_util *au, FILE * f, struct rtattr *arg)
format_host_r(AF_INET, 4, &sel->new_addr, buf1, sizeof(buf1))); format_host_r(AF_INET, 4, &sel->new_addr, buf1, sizeof(buf1)));
print_action_control(f, " ", sel->action, ""); print_action_control(f, " ", sel->action, "");
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
print_uint(PRINT_ANY, "index", "\t index %u", sel->index); print_uint(PRINT_ANY, "index", "\t index %u", sel->index);
print_int(PRINT_ANY, "ref", " ref %d", sel->refcnt); print_int(PRINT_ANY, "ref", " ref %d", sel->refcnt);
print_int(PRINT_ANY, "bind", " bind %d", sel->bindcnt); print_int(PRINT_ANY, "bind", " bind %d", sel->bindcnt);
@ -185,7 +185,7 @@ print_nat(struct action_util *au, FILE * f, struct rtattr *arg)
} }
} }
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
return 0; return 0;
} }

4
tc/m_sample.c
View File

@ -167,7 +167,7 @@ static int print_sample(struct action_util *au, FILE *f, struct rtattr *arg)
print_action_control(f, " ", p->action, ""); print_action_control(f, " ", p->action, "");
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
print_uint(PRINT_ANY, "index", "\t index %u", p->index); print_uint(PRINT_ANY, "index", "\t index %u", p->index);
print_int(PRINT_ANY, "ref", " ref %d", p->refcnt); print_int(PRINT_ANY, "ref", " ref %d", p->refcnt);
print_int(PRINT_ANY, "bind", " bind %d", p->bindcnt); print_int(PRINT_ANY, "bind", " bind %d", p->bindcnt);
@ -179,7 +179,7 @@ static int print_sample(struct action_util *au, FILE *f, struct rtattr *arg)
print_tm(f, tm); print_tm(f, tm);
} }
} }
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
return 0; return 0;
} }

4
tc/m_skbedit.c
View File

@ -254,7 +254,7 @@ static int print_skbedit(struct action_util *au, FILE *f, struct rtattr *arg)
print_action_control(f, " ", p->action, ""); print_action_control(f, " ", p->action, "");
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
print_uint(PRINT_ANY, "index", "\t index %u", p->index); print_uint(PRINT_ANY, "index", "\t index %u", p->index);
print_int(PRINT_ANY, "ref", " ref %d", p->refcnt); print_int(PRINT_ANY, "ref", " ref %d", p->refcnt);
print_int(PRINT_ANY, "bind", " bind %d", p->bindcnt); print_int(PRINT_ANY, "bind", " bind %d", p->bindcnt);
@ -267,7 +267,7 @@ static int print_skbedit(struct action_util *au, FILE *f, struct rtattr *arg)
} }
} }
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
return 0; return 0;
} }

16
tc/m_tunnel_key.c
View File

@ -367,7 +367,7 @@ static void tunnel_key_print_ip_addr(FILE *f, const char *name,
else else
return; return;
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
if (matches(name, "src_ip") == 0) if (matches(name, "src_ip") == 0)
print_string(PRINT_ANY, "src_ip", "\tsrc_ip %s", print_string(PRINT_ANY, "src_ip", "\tsrc_ip %s",
rt_addr_n2a_rta(family, attr)); rt_addr_n2a_rta(family, attr));
@ -381,7 +381,7 @@ static void tunnel_key_print_key_id(FILE *f, const char *name,
{ {
if (!attr) if (!attr)
return; return;
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
print_uint(PRINT_ANY, "key_id", "\tkey_id %u", rta_getattr_be32(attr)); print_uint(PRINT_ANY, "key_id", "\tkey_id %u", rta_getattr_be32(attr));
} }
@ -390,7 +390,7 @@ static void tunnel_key_print_dst_port(FILE *f, char *name,
{ {
if (!attr) if (!attr)
return; return;
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
print_uint(PRINT_ANY, "dst_port", "\tdst_port %u", print_uint(PRINT_ANY, "dst_port", "\tdst_port %u",
rta_getattr_be16(attr)); rta_getattr_be16(attr));
} }
@ -401,7 +401,7 @@ static void tunnel_key_print_flag(FILE *f, const char *name_on,
{ {
if (!attr) if (!attr)
return; return;
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
print_string(PRINT_ANY, "flag", "\t%s", print_string(PRINT_ANY, "flag", "\t%s",
rta_getattr_u8(attr) ? name_on : name_off); rta_getattr_u8(attr) ? name_on : name_off);
} }
@ -473,11 +473,11 @@ static void tunnel_key_print_tos_ttl(FILE *f, char *name,
return; return;
if (matches(name, "tos") == 0 && rta_getattr_u8(attr) != 0) { if (matches(name, "tos") == 0 && rta_getattr_u8(attr) != 0) {
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
print_uint(PRINT_ANY, "tos", "\ttos 0x%x", print_uint(PRINT_ANY, "tos", "\ttos 0x%x",
rta_getattr_u8(attr)); rta_getattr_u8(attr));
} else if (matches(name, "ttl") == 0 && rta_getattr_u8(attr) != 0) { } else if (matches(name, "ttl") == 0 && rta_getattr_u8(attr) != 0) {
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
print_uint(PRINT_ANY, "ttl", "\tttl %u", print_uint(PRINT_ANY, "ttl", "\tttl %u",
rta_getattr_u8(attr)); rta_getattr_u8(attr));
} }
@ -531,7 +531,7 @@ static int print_tunnel_key(struct action_util *au, FILE *f, struct rtattr *arg)
} }
print_action_control(f, " ", parm->action, ""); print_action_control(f, " ", parm->action, "");
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
print_uint(PRINT_ANY, "index", "\t index %u", parm->index); print_uint(PRINT_ANY, "index", "\t index %u", parm->index);
print_int(PRINT_ANY, "ref", " ref %d", parm->refcnt); print_int(PRINT_ANY, "ref", " ref %d", parm->refcnt);
print_int(PRINT_ANY, "bind", " bind %d", parm->bindcnt); print_int(PRINT_ANY, "bind", " bind %d", parm->bindcnt);
@ -544,7 +544,7 @@ static int print_tunnel_key(struct action_util *au, FILE *f, struct rtattr *arg)
} }
} }
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
return 0; return 0;
} }

8
tc/q_taprio.c
View File

@ -368,7 +368,7 @@ static int print_sched_list(FILE *f, struct rtattr *list)
open_json_array(PRINT_JSON, "schedule"); open_json_array(PRINT_JSON, "schedule");
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
for (item = RTA_DATA(list); RTA_OK(item, rem); item = RTA_NEXT(item, rem)) { for (item = RTA_DATA(list); RTA_OK(item, rem); item = RTA_NEXT(item, rem)) {
struct rtattr *tb[TCA_TAPRIO_SCHED_ENTRY_MAX + 1]; struct rtattr *tb[TCA_TAPRIO_SCHED_ENTRY_MAX + 1];
@ -396,7 +396,7 @@ static int print_sched_list(FILE *f, struct rtattr *list)
print_uint(PRINT_ANY, "interval", " interval %u", interval); print_uint(PRINT_ANY, "interval", " interval %u", interval);
close_json_object(); close_json_object();
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
} }
close_json_array(PRINT_ANY, ""); close_json_array(PRINT_ANY, "");
@ -454,7 +454,7 @@ static int taprio_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
print_uint(PRINT_ANY, NULL, " %u", qopt->prio_tc_map[i]); print_uint(PRINT_ANY, NULL, " %u", qopt->prio_tc_map[i]);
close_json_array(PRINT_ANY, ""); close_json_array(PRINT_ANY, "");
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
open_json_array(PRINT_ANY, "queues"); open_json_array(PRINT_ANY, "queues");
for (i = 0; i < qopt->num_tc; i++) { for (i = 0; i < qopt->num_tc; i++) {
@ -465,7 +465,7 @@ static int taprio_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
} }
close_json_array(PRINT_ANY, ""); close_json_array(PRINT_ANY, "");
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
if (tb[TCA_TAPRIO_ATTR_SCHED_CLOCKID]) if (tb[TCA_TAPRIO_ATTR_SCHED_CLOCKID])
clockid = rta_getattr_s32(tb[TCA_TAPRIO_ATTR_SCHED_CLOCKID]); clockid = rta_getattr_s32(tb[TCA_TAPRIO_ATTR_SCHED_CLOCKID]);

4
tc/tc_util.c
View File

@ -788,7 +788,7 @@ static void print_tcstats_basic_hw(struct rtattr **tbs, char *prefix)
sizeof(bs))); sizeof(bs)));
if (bs.bytes >= bs_hw.bytes && bs.packets >= bs_hw.packets) { if (bs.bytes >= bs_hw.bytes && bs.packets >= bs_hw.packets) {
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
print_string(PRINT_FP, NULL, "%s", prefix); print_string(PRINT_FP, NULL, "%s", prefix);
print_lluint(PRINT_ANY, "sw_bytes", print_lluint(PRINT_ANY, "sw_bytes",
"Sent software %llu bytes", "Sent software %llu bytes",
@ -798,7 +798,7 @@ static void print_tcstats_basic_hw(struct rtattr **tbs, char *prefix)
} }
} }
print_string(PRINT_FP, NULL, "%s", _SL_); print_nl();
print_string(PRINT_FP, NULL, "%s", prefix); print_string(PRINT_FP, NULL, "%s", prefix);
print_lluint(PRINT_ANY, "hw_bytes", "Sent hardware %llu bytes", print_lluint(PRINT_ANY, "hw_bytes", "Sent hardware %llu bytes",
bs_hw.bytes); bs_hw.bytes);