diff options
author | Maria Matejka <mq@ucw.cz> | 2022-06-27 11:04:57 +0200 |
---|---|---|
committer | Maria Matejka <mq@ucw.cz> | 2022-06-27 12:32:47 +0200 |
commit | 0f2f5ac58c8bc487ad62d153bfc5ebdb97d54fbd (patch) | |
tree | 500184bc92b68223a8f77150fb5d5ccf2f963499 /nest | |
parent | dfb61dfceaa72dda477a5433a193da316dccef7f (diff) |
Fixed minor bugs in handling some route attributes
Diffstat (limited to 'nest')
-rw-r--r-- | nest/rt-attr.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/nest/rt-attr.c b/nest/rt-attr.c index ed3aaf01..cec1d7cf 100644 --- a/nest/rt-attr.c +++ b/nest/rt-attr.c @@ -836,7 +836,7 @@ ea_normalize(ea_list *e, int overlay) ea_merge(e, t, overlay); ea_sort(t); - return t->count ? t : NULL; + return t->count ? t : t->next; } /** @@ -1075,11 +1075,6 @@ ea_show(struct cli *c, const eattr *e) struct ea_class *cls = ea_class_global[e->id]; ASSERT_DIE(cls); - pos += bsprintf(pos, "%s", cls->name); - - *pos++ = ':'; - *pos++ = ' '; - if (e->undef) return; else if (cls->format) @@ -1115,7 +1110,7 @@ ea_show(struct cli *c, const eattr *e) bsprintf(pos, "<type %02x>", e->type); } - cli_printf(c, -1012, "\t%s", buf); + cli_printf(c, -1012, "\t%s: %s", cls->name, buf); } static void |