mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-07-27 15:23:39 +00:00
Merge pull request #1518 from opensourcerouting/clippy-issues
*: make clippy usage more consistent
This commit is contained in:
commit
d17ea5225b
@ -52,7 +52,9 @@
|
|||||||
#include "libfrr.h"
|
#include "libfrr.h"
|
||||||
#include "version.h"
|
#include "version.h"
|
||||||
|
|
||||||
#include "bgp_rpki_clippy.c"
|
#ifndef VTYSH_EXTRACT_PL
|
||||||
|
#include "bgpd/bgp_rpki_clippy.c"
|
||||||
|
#endif
|
||||||
|
|
||||||
DEFINE_MTYPE_STATIC(BGPD, BGP_RPKI_CACHE, "BGP RPKI Cache server")
|
DEFINE_MTYPE_STATIC(BGPD, BGP_RPKI_CACHE, "BGP RPKI Cache server")
|
||||||
DEFINE_MTYPE_STATIC(BGPD, BGP_RPKI_CACHE_GROUP, "BGP RPKI Cache server group")
|
DEFINE_MTYPE_STATIC(BGPD, BGP_RPKI_CACHE_GROUP, "BGP RPKI Cache server group")
|
||||||
|
@ -721,7 +721,7 @@ static void bgp_clear_star_soft_out(struct vty *vty, const char *name)
|
|||||||
|
|
||||||
|
|
||||||
#ifndef VTYSH_EXTRACT_PL
|
#ifndef VTYSH_EXTRACT_PL
|
||||||
#include "bgp_vty_clippy.c"
|
#include "bgpd/bgp_vty_clippy.c"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* BGP global configuration. */
|
/* BGP global configuration. */
|
||||||
|
@ -210,7 +210,7 @@ all DEFPY statements**:
|
|||||||
|
|
||||||
...
|
...
|
||||||
|
|
||||||
#include "filename_clippy.c"
|
#include "daemon/filename_clippy.c"
|
||||||
|
|
||||||
DEFPY(...)
|
DEFPY(...)
|
||||||
DEFPY(...)
|
DEFPY(...)
|
||||||
|
@ -38,6 +38,7 @@ ldpd_libldp_a_SOURCES = \
|
|||||||
ldpd/util.c \
|
ldpd/util.c \
|
||||||
# end
|
# end
|
||||||
|
|
||||||
|
ldpd/ldp_vty_cmds_clippy.c: $(CLIPPY_DEPS)
|
||||||
ldpd/ldp_vty_cmds.$(OBJEXT): ldpd/ldp_vty_cmds_clippy.c
|
ldpd/ldp_vty_cmds.$(OBJEXT): ldpd/ldp_vty_cmds_clippy.c
|
||||||
|
|
||||||
noinst_HEADERS += \
|
noinst_HEADERS += \
|
||||||
|
@ -1321,7 +1321,7 @@ static int vty_clear_prefix_list(struct vty *vty, afi_t afi, const char *name,
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifndef VTYSH_EXTRACT_PL
|
#ifndef VTYSH_EXTRACT_PL
|
||||||
#include "plist_clippy.c"
|
#include "lib/plist_clippy.c"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
DEFPY (ip_prefix_list,
|
DEFPY (ip_prefix_list,
|
||||||
|
@ -187,7 +187,7 @@ static void ospf_show_vrf_name(struct ospf *ospf, struct vty *vty,
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifndef VTYSH_EXTRACT_PL
|
#ifndef VTYSH_EXTRACT_PL
|
||||||
#include "ospf_vty_clippy.c"
|
#include "ospfd/ospf_vty_clippy.c"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
DEFUN_NOSH (router_ospf,
|
DEFUN_NOSH (router_ospf,
|
||||||
|
@ -29,7 +29,9 @@
|
|||||||
|
|
||||||
#include "sharpd/sharp_zebra.h"
|
#include "sharpd/sharp_zebra.h"
|
||||||
#include "sharpd/sharp_vty.h"
|
#include "sharpd/sharp_vty.h"
|
||||||
|
#ifndef VTYSH_EXTRACT_PL
|
||||||
#include "sharpd/sharp_vty_clippy.c"
|
#include "sharpd/sharp_vty_clippy.c"
|
||||||
|
#endif
|
||||||
|
|
||||||
extern uint32_t total_routes;
|
extern uint32_t total_routes;
|
||||||
extern uint32_t installed_routes;
|
extern uint32_t installed_routes;
|
||||||
|
Loading…
Reference in New Issue
Block a user