From cbe0841215e99384ac75fa10b48fd423655676e9 Mon Sep 17 00:00:00 2001 From: claudio Date: Mon, 17 Oct 2022 16:51:36 +0000 Subject: [PATCH] SHOW_METRICS for the actions enum. Just to match the rest. --- usr.sbin/bgpctl/bgpctl.c | 6 +++--- usr.sbin/bgpctl/parser.c | 4 ++-- usr.sbin/bgpctl/parser.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/usr.sbin/bgpctl/bgpctl.c b/usr.sbin/bgpctl/bgpctl.c index 57613c98881..016809272f2 100644 --- a/usr.sbin/bgpctl/bgpctl.c +++ b/usr.sbin/bgpctl/bgpctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bgpctl.c,v 1.285 2022/10/17 12:01:19 claudio Exp $ */ +/* $OpenBSD: bgpctl.c,v 1.286 2022/10/17 16:51:36 claudio Exp $ */ /* * Copyright (c) 2003 Henning Brauer @@ -256,7 +256,7 @@ main(int argc, char *argv[]) case SHOW_RIB_MEM: imsg_compose(ibuf, IMSG_CTL_SHOW_RIB_MEM, 0, 0, -1, NULL, 0); break; - case SHOW_METRIC: + case SHOW_METRICS: output = &ometric_output; numdone = 2; imsg_compose(ibuf, IMSG_CTL_SHOW_NEIGHBOR, 0, 0, -1, NULL, 0); @@ -400,7 +400,7 @@ main(int argc, char *argv[]) } - if (res->action == SHOW_METRIC && --numdone > 0) { + if (res->action == SHOW_METRICS && --numdone > 0) { done = 0; goto again; } diff --git a/usr.sbin/bgpctl/parser.c b/usr.sbin/bgpctl/parser.c index 730fc8ebc42..df79566a933 100644 --- a/usr.sbin/bgpctl/parser.c +++ b/usr.sbin/bgpctl/parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parser.c,v 1.116 2022/10/17 15:04:12 claudio Exp $ */ +/* $OpenBSD: parser.c,v 1.117 2022/10/17 16:51:36 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer @@ -141,7 +141,7 @@ static const struct token t_show[] = { { KEYWORD, "sets", SHOW_SET, NULL}, { KEYWORD, "rtr", SHOW_RTR, NULL}, { KEYWORD, "mrt", SHOW_MRT, t_show_mrt}, - { KEYWORD, "metrics", SHOW_METRIC, NULL}, + { KEYWORD, "metrics", SHOW_METRICS, NULL}, { ENDTOKEN, "", NONE, NULL} }; diff --git a/usr.sbin/bgpctl/parser.h b/usr.sbin/bgpctl/parser.h index 45fea196003..9f1ae95e9e5 100644 --- a/usr.sbin/bgpctl/parser.h +++ b/usr.sbin/bgpctl/parser.h @@ -1,4 +1,4 @@ -/* $OpenBSD: parser.h,v 1.43 2022/10/17 12:01:19 claudio Exp $ */ +/* $OpenBSD: parser.h,v 1.44 2022/10/17 16:51:36 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer @@ -37,7 +37,7 @@ enum actions { SHOW_RIB_MEM, SHOW_NEXTHOP, SHOW_INTERFACE, - SHOW_METRIC, + SHOW_METRICS, RELOAD, FIB, FIB_COUPLE, -- 2.20.1