* [PATCH iproute2-next 1/1] tc: support oneline mode in action generic printer functions
@ 2018-03-31 4:16 Roman Mashak
2018-04-01 15:43 ` David Ahern
0 siblings, 1 reply; 2+ messages in thread
From: Roman Mashak @ 2018-03-31 4:16 UTC (permalink / raw)
To: dsahern; +Cc: stephen, netdev, kernel, jhs, xiyou.wangcong, jiri, Roman Mashak
Signed-off-by: Roman Mashak <mrv@mojatatu.com>
---
tc/m_action.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/tc/m_action.c b/tc/m_action.c
index 8891659ae15a..2f85d353279a 100644
--- a/tc/m_action.c
+++ b/tc/m_action.c
@@ -301,19 +301,21 @@ static int tc_print_one_action(FILE *f, struct rtattr *arg)
return err;
if (show_stats && tb[TCA_ACT_STATS]) {
- print_string(PRINT_FP, NULL, "\tAction statistics:\n", NULL);
+ print_string(PRINT_FP, NULL, "\tAction statistics:", NULL);
+ print_string(PRINT_FP, NULL, "%s", _SL_);
open_json_object("stats");
print_tcstats2_attr(f, tb[TCA_ACT_STATS], "\t", NULL);
close_json_object();
- print_string(PRINT_FP, NULL, "\n", NULL);
+ print_string(PRINT_FP, NULL, "%s", _SL_);
}
if (tb[TCA_ACT_COOKIE]) {
int strsz = RTA_PAYLOAD(tb[TCA_ACT_COOKIE]);
char b1[strsz * 2 + 1];
- print_string(PRINT_ANY, "cookie", "\tcookie %s\n",
+ print_string(PRINT_ANY, "cookie", "\tcookie %s",
hexstring_n2a(RTA_DATA(tb[TCA_ACT_COOKIE]),
strsz, b1, sizeof(b1)));
+ print_string(PRINT_FP, NULL, "%s", _SL_);
}
return 0;
@@ -369,8 +371,9 @@ tc_print_action(FILE *f, const struct rtattr *arg, unsigned short tot_acts)
for (i = 0; i <= tot_acts; i++) {
if (tb[i]) {
open_json_object(NULL);
+ print_string(PRINT_FP, NULL, "%s", _SL_);
print_uint(PRINT_ANY, "order",
- "\n\taction order %u: ", i);
+ "\taction order %u: ", i);
if (tc_print_one_action(f, tb[i]) < 0) {
print_string(PRINT_FP, NULL,
"Error printing action\n", NULL);
@@ -410,6 +413,7 @@ int print_action(const struct sockaddr_nl *who,
open_json_object(NULL);
print_uint(PRINT_ANY, "total acts", "total acts %u",
tot_acts ? *tot_acts : 0);
+ print_string(PRINT_FP, NULL, "%s", _SL_);
close_json_object();
if (tb[TCA_ACT_TAB] == NULL) {
if (n->nlmsg_type != RTM_GETACTION)
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH iproute2-next 1/1] tc: support oneline mode in action generic printer functions
2018-03-31 4:16 [PATCH iproute2-next 1/1] tc: support oneline mode in action generic printer functions Roman Mashak
@ 2018-04-01 15:43 ` David Ahern
0 siblings, 0 replies; 2+ messages in thread
From: David Ahern @ 2018-04-01 15:43 UTC (permalink / raw)
To: Roman Mashak; +Cc: stephen, netdev, kernel, jhs, xiyou.wangcong, jiri
On 3/30/18 10:16 PM, Roman Mashak wrote:
> Signed-off-by: Roman Mashak <mrv@mojatatu.com>
> ---
> tc/m_action.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
applied to iproute2-next
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-04-01 15:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-31 4:16 [PATCH iproute2-next 1/1] tc: support oneline mode in action generic printer functions Roman Mashak
2018-04-01 15:43 ` David Ahern
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.