From 6365b6c89affbdba3bce68c166c8539cf22de462 Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Tue, 13 Jun 2023 16:08:24 +0300 Subject: [PATCH] bgpd: Use enum bgp_create_error_code as argument in header MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit ``` bgpd/bgp_vty.c:865:5: warning: conflicting types for ‘bgp_vty_return’ due to enum/integer mismatch; have ‘int(struct vty *, enum bgp_create_error_code)’ [-Wenum-int-mismatch] 865 | int bgp_vty_return(struct vty *vty, enum bgp_create_error_code ret) | ^~~~~~~~~~~~~~ In file included from ./bgpd/bgp_mplsvpn.h:15, from bgpd/bgp_vty.c:48: ./bgpd/bgp_vty.h:148:12: note: previous declaration of ‘bgp_vty_return’ with type ‘int(struct vty *, int)’ 148 | extern int bgp_vty_return(struct vty *vty, int ret); | ^~~~~~~~~~~~~~ ``` Fixing stuff regarding GCC13. Signed-off-by: Donatas Abraitis (cherry picked from commit cc280c74cea8183b31f60ef16bda617eca364c9d) --- bgpd/bgp_vty.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgpd/bgp_vty.h b/bgpd/bgp_vty.h index 9526b50fb9..4c11212ffe 100644 --- a/bgpd/bgp_vty.h +++ b/bgpd/bgp_vty.h @@ -160,7 +160,7 @@ extern void bgp_config_write_wpkt_quanta(struct vty *vty, struct bgp *bgp); extern void bgp_config_write_rpkt_quanta(struct vty *vty, struct bgp *bgp); extern void bgp_config_write_listen(struct vty *vty, struct bgp *bgp); extern void bgp_config_write_coalesce_time(struct vty *vty, struct bgp *bgp); -extern int bgp_vty_return(struct vty *vty, int ret); +extern int bgp_vty_return(struct vty *vty, enum bgp_create_error_code ret); extern bool bgp_config_inprocess(void); extern struct peer *peer_and_group_lookup_vty(struct vty *vty, const char *peer_str); -- 2.39.5