diff options
authorStefan Sperling <ssperling@sysmocom.de>2018-10-26 15:14:19 +0200
committerStefan Sperling <ssperling@sysmocom.de>2018-10-29 13:48:47 +0000
commit7c75ffb563cbfba352330003ba5de20c586b14b8 (patch)
parentde1da35d51555648b331a7fd619ad02a1630987a (diff)
stop printing group description in vty_out_rate_ctr_group_fmt()
When vty_out_rate_ctr_group_fmt() prints the description of a counter group, it assumes this description should appear at the beginning of a line. However, the caller might be printing counters in an indented context. So just let the caller worry about printing the group title if necessary (there is currently only one known caller, which is updated in this commit). Note that printing of the group title was an undocumented feature. Change-Id: I2c55cb54e8b7a7c8c6cf72f22287083767ed0201 Related: OS#2660
2 files changed, 1 insertions, 3 deletions
diff --git a/src/vty/stats_vty.c b/src/vty/stats_vty.c
index 5ded7a44..62153f3c 100644
--- a/src/vty/stats_vty.c
+++ b/src/vty/stats_vty.c
@@ -533,6 +533,7 @@ DEFUN(show_stats_asciidoc_table,
static int rate_ctr_group_handler(struct rate_ctr_group *ctrg, void *sctx_)
struct vty *vty = sctx_;
+ vty_out(vty, "%s:%s", ctrg->desc->group_description, VTY_NEWLINE);
vty_out_rate_ctr_group_fmt(vty, "%25n: %10c (%S/s %M/m %H/h %D/d) %d", ctrg);
return 0;
diff --git a/src/vty/utils.c b/src/vty/utils.c
index 0d663c6e..0358d9bd 100644
--- a/src/vty/utils.c
+++ b/src/vty/utils.c
@@ -214,9 +214,6 @@ void vty_out_rate_ctr_group_fmt(struct vty *vty, const char *fmt,
struct rate_ctr_group *ctrg)
struct vty_out_context vctx = {vty, fmt};
- vty_out(vty, "%s:%s", ctrg->desc->group_description, VTY_NEWLINE);
rate_ctr_for_each_counter(ctrg, rate_ctr_handler_fmt, &vctx);