Merge pull request #1518 from opensourcerouting/clippy-issues

*: make clippy usage more consistent
This commit is contained in:
Donald Sharp 2017-12-04 17:45:05 -05:00 committed by GitHub
commit d17ea5225b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 5 deletions

View File

@ -52,7 +52,9 @@
#include "libfrr.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_GROUP, "BGP RPKI Cache server group")

View File

@ -721,7 +721,7 @@ static void bgp_clear_star_soft_out(struct vty *vty, const char *name)
#ifndef VTYSH_EXTRACT_PL
#include "bgp_vty_clippy.c"
#include "bgpd/bgp_vty_clippy.c"
#endif
/* BGP global configuration. */

View File

@ -210,7 +210,7 @@ all DEFPY statements**:
...
#include "filename_clippy.c"
#include "daemon/filename_clippy.c"
DEFPY(...)
DEFPY(...)

View File

@ -38,6 +38,7 @@ ldpd_libldp_a_SOURCES = \
ldpd/util.c \
# end
ldpd/ldp_vty_cmds_clippy.c: $(CLIPPY_DEPS)
ldpd/ldp_vty_cmds.$(OBJEXT): ldpd/ldp_vty_cmds_clippy.c
noinst_HEADERS += \

View File

@ -1321,7 +1321,7 @@ static int vty_clear_prefix_list(struct vty *vty, afi_t afi, const char *name,
}
#ifndef VTYSH_EXTRACT_PL
#include "plist_clippy.c"
#include "lib/plist_clippy.c"
#endif
DEFPY (ip_prefix_list,

View File

@ -187,7 +187,7 @@ static void ospf_show_vrf_name(struct ospf *ospf, struct vty *vty,
}
#ifndef VTYSH_EXTRACT_PL
#include "ospf_vty_clippy.c"
#include "ospfd/ospf_vty_clippy.c"
#endif
DEFUN_NOSH (router_ospf,

View File

@ -29,7 +29,9 @@
#include "sharpd/sharp_zebra.h"
#include "sharpd/sharp_vty.h"
#ifndef VTYSH_EXTRACT_PL
#include "sharpd/sharp_vty_clippy.c"
#endif
extern uint32_t total_routes;
extern uint32_t installed_routes;