proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-04-28 13:20:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

*: strip trailing whitespace

Browse Source 
Some of it has snuck by CI

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2019-09-30 16:44:43 +00:00
parent c4cb0574d4
commit c258527bd2
17 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
babeld/babel_interface.c
View File

@ -1067,7 +1067,7 @@ DEFUN (show_babel_route_prefix,
vty_out (vty, "%% Malformed address\n");
return CMD_WARNING;
}
routes = route_stream(0);
if(routes) {
while(1) {

2
bgpd/bgp_bmp.c
View File

@ -1632,7 +1632,7 @@ static void bmp_active_connect(struct bmp_active *ba)
ba->hostname);
continue;
}
set_nonblocking(ba->socket);
res = sockunion_connect(ba->socket, &ba->addrs[ba->addrpos],
htons(ba->port), 0);

2
bgpd/bgp_snmp.c
View File

@ -46,7 +46,7 @@
/* BGP TRAP. */
#define BGPESTABLISHED 1
#define BGPBACKWARDTRANSITION 2
#define BGPBACKWARDTRANSITION 2
/* BGP MIB bgpVersion. */
#define BGPVERSION 0

12
bgpd/bgp_vty.c
View File

@ -7918,7 +7918,7 @@ static void bgp_show_peer_reset(struct vty * vty, struct peer *peer,
msg_str);
}
}
}
json_object_string_add(json_peer, "lastResetDueTo",
peer_down_str[(int)peer->last_reset]);
json_object_int_add(json_peer, "lastResetCode",
@ -8003,7 +8003,7 @@ static void bgp_show_failed_summary(struct vty *vty, struct bgp *bgp,
false);
}
}
/* Show BGP peer's summary information. */
static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
@ -8049,7 +8049,7 @@ static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
if (peer_dynamic_neighbor(peer))
dn_count++;
}
} else {
/* Loop over all neighbors that will be displayed to determine
* how many
@ -8078,7 +8078,7 @@ static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
if (len > max_neighbor_width)
max_neighbor_width = len;
/* See if we have at least a single failed peer */
if (bgp_has_peer_failed(peer, afi, safi))
failed_count++;
@ -8097,7 +8097,7 @@ static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
if (use_json) {
json_object_int_add(json, "failedPeersCount", 0);
json_object_int_add(json, "dynamicPeers", dn_count);
json_object_int_add(json, "totalPeers", count);
json_object_int_add(json, "totalPeers", count);
vty_out(vty, "%s\n", json_object_to_json_string_ext(
json, JSON_C_TO_STRING_PRETTY));
@ -8108,7 +8108,7 @@ static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
}
return CMD_SUCCESS;
}
count = 0; /* Reset the value as its used again */
for (ALL_LIST_ELEMENTS(bgp->peer, node, nnode, peer)) {
if (!CHECK_FLAG(peer->flags, PEER_FLAG_CONFIG_NODE))

4
include/linux/netlink.h
View File

@ -16,7 +16,7 @@
#define NETLINK_SELINUX 7 /* SELinux event notifications */
#define NETLINK_ISCSI 8 /* Open-iSCSI */
#define NETLINK_AUDIT 9 /* auditing */
#define NETLINK_FIB_LOOKUP 10
#define NETLINK_FIB_LOOKUP 10
#define NETLINK_CONNECTOR 11
#define NETLINK_NETFILTER 12 /* netfilter subsystem */
#define NETLINK_IP6_FW 13
@ -32,7 +32,7 @@
#define NETLINK_INET_DIAG NETLINK_SOCK_DIAG
#define MAX_LINKS 32
#define MAX_LINKS 32
struct sockaddr_nl {
__kernel_sa_family_t nl_family; /* AF_NETLINK */

8
include/linux/rtnetlink.h
View File

@ -172,7 +172,7 @@ enum {
#define RTM_NR_FAMILIES (RTM_NR_MSGTYPES >> 2)
#define RTM_FAM(cmd) (((cmd) - RTM_BASE) >> 2)
/*
/*
Generic structure for encapsulation of optional route information.
It is reminiscent of sockaddr, but with sa_family replaced
with attribute type.
@ -212,7 +212,7 @@ struct rtmsg {
unsigned char rtm_table; /* Routing table id */
unsigned char rtm_protocol; /* Routing protocol; see below */
unsigned char rtm_scope; /* See below */
unsigned char rtm_scope; /* See below */
unsigned char rtm_type; /* See below */
unsigned rtm_flags;
@ -523,7 +523,7 @@ struct ifinfomsg {
};
/********************************************************************
* prefix information
* prefix information
****/
struct prefixmsg {
@ -537,7 +537,7 @@ struct prefixmsg {
unsigned char prefix_pad3;
};
enum
enum
{
PREFIX_UNSPEC,
PREFIX_ADDRESS,

6
lib/printf/printf-pos.c
View File

@ -98,7 +98,7 @@ inittypes(struct typetable *types)
types->table = types->stattable;
types->tablesize = STATIC_ARG_TBL_SIZE;
types->tablemax = 0;
types->tablemax = 0;
types->nextarg = 1;
for (n = 0; n < STATIC_ARG_TBL_SIZE; n++)
types->table[n] = T_UNUSED;
@ -106,7 +106,7 @@ inittypes(struct typetable *types)
/*
* struct typetable destructor.
*/
*/
static inline void
freetypes(struct typetable *types)
{
@ -255,7 +255,7 @@ addwaster(struct typetable *types, wchar_t **fmtp)
* initial argument table should be an array of STATIC_ARG_TBL_SIZE entries.
* It will be replaces with a malloc-ed one if it overflows.
* Returns 0 on success. On failure, returns nonzero and sets errno.
*/
*/
int
_frr_find_arguments (const char *fmt0, va_list ap, union arg **argtable)
{

2
lib/typesafe.c
View File

@ -473,7 +473,7 @@ void typesafe_heap_resize(struct heap_head *head, bool grow)
newsize &= ~(HEAP_NARY - 1);
if (newsize == head->arraysz)
return;
head->array = XREALLOC(MTYPE_HEAP_ARRAY, head->array,
newsize * sizeof(struct heap_item *));
head->arraysz = newsize;

4
ospfd/ospf_ase.c
View File

@ -190,7 +190,7 @@ ospf_ase_calculate_asbr_route (struct ospf *ospf,
zlog_debug ("ospf_ase_calculate(): Originating router is not an ASBR");
return NULL;
}
if (al->e[0].fwd_addr.s_addr != 0)
{
if (IS_DEBUG_OSPF (lsa, LSA))
@ -215,7 +215,7 @@ ospf_ase_calculate_asbr_route (struct ospf *ospf,
asbr.prefixlen = IPV4_MAX_BITLEN;
rn = route_node_match (rt_network, (struct prefix *) &asbr);
if (rn == NULL)
{
if (IS_DEBUG_OSPF (lsa, LSA))

2
ospfd/ospf_lsa.c
View File

@ -2437,7 +2437,7 @@ static struct ospf_lsa *ospf_summary_asbr_lsa_install(struct ospf *ospf,
#if 0
/* These don't exist yet... */
ospf_summary_incremental_update(new);
/* Isn't this done by the above call?
/* Isn't this done by the above call?
- RFC 2328 Section 16.5 implies it should be */
/* ospf_ase_calculate_schedule(); */
#else /* #if 0 */

2
pimd/pim_hello.c
View File

@ -104,7 +104,7 @@ static void tlv_trace(const char *label, const char *tlv_name,
char src_str[INET_ADDRSTRLEN];
pim_inet4_dump("<src?>", src_addr, src_str, sizeof(src_str));
zlog_debug("%s: PIM hello option from %s on interface %s: %s",
label,
label,
src_str, ifname,
tlv_name);
}

2
ripd/rip_snmp.c
View File

@ -551,7 +551,7 @@ static uint8_t *rip2PeerTable(struct variable *v, oid name[], size_t *length,
return (uint8_t *)&domain;
case RIP2PEERLASTUPDATE:
#if 0
#if 0
/* We don't know the SNMP agent startup time. We have two choices here:
* - assume ripd startup time equals SNMP agent startup time
* - don't support this variable, at all

4
ripngd/ripng_interface.c
View File

@ -43,10 +43,10 @@
/* If RFC2133 definition is used. */
#ifndef IPV6_JOIN_GROUP
#define IPV6_JOIN_GROUP IPV6_ADD_MEMBERSHIP
#define IPV6_JOIN_GROUP IPV6_ADD_MEMBERSHIP
#endif
#ifndef IPV6_LEAVE_GROUP
#define IPV6_LEAVE_GROUP IPV6_DROP_MEMBERSHIP
#define IPV6_LEAVE_GROUP IPV6_DROP_MEMBERSHIP
#endif
DEFINE_MTYPE_STATIC(RIPNGD, RIPNG_IF, "ripng interface")

2
ripngd/ripngd.c
View File

@ -2361,7 +2361,7 @@ DEFUN (show_ipv6_protocols,
return CMD_SUCCESS;
vty_out (vty, "Routing Protocol is \"ripng\"\n");
vty_out (vty, "Sending updates every %ld seconds, next due in %d seconds\n",
ripng->update_time, 0);

2
tests/lib/test_typelist.h
View File

@ -280,7 +280,7 @@ static void concat(test_, TYPE)(void)
assert(!tmp || tmp->val >= j);
} else
assert(gteq == list_first(&head));
if (gteq)
assert(gteq->val >= j);
}

10
zebra/irdp.h
View File

@ -51,7 +51,7 @@ extern "C" {
#endif /* INADDR_ALLRTRS_GROUP */
/* Default irdp packet interval */
#define IRDP_DEFAULT_INTERVAL 300
#define IRDP_DEFAULT_INTERVAL 300
/* Router constants from RFC1256 */
#define MAX_INITIAL_ADVERT_INTERVAL 16
@ -123,10 +123,10 @@ struct irdp_interface {
#define IF_ACTIVE (1<<0) /* ICMP Active */
#define IF_BROADCAST (1<<1) /* 255.255.255.255 */
#define IF_SOLICIT (1<<2) /* Solicit active */
#define IF_DEBUG_MESSAGES (1<<3)
#define IF_DEBUG_PACKET (1<<4)
#define IF_DEBUG_MISC (1<<5)
#define IF_SHUTDOWN (1<<6)
#define IF_DEBUG_MESSAGES (1<<3)
#define IF_DEBUG_PACKET (1<<4)
#define IF_DEBUG_MISC (1<<5)
#define IF_SHUTDOWN (1<<6)
struct interface *ifp;
struct thread *t_advertise;

4
zebra/rtadv.c
View File

@ -58,10 +58,10 @@ DEFINE_MTYPE_STATIC(ZEBRA, RTADV_PREFIX, "Router Advertisement Prefix")
/* If RFC2133 definition is used. */
#ifndef IPV6_JOIN_GROUP
#define IPV6_JOIN_GROUP IPV6_ADD_MEMBERSHIP
#define IPV6_JOIN_GROUP IPV6_ADD_MEMBERSHIP
#endif
#ifndef IPV6_LEAVE_GROUP
#define IPV6_LEAVE_GROUP IPV6_DROP_MEMBERSHIP
#define IPV6_LEAVE_GROUP IPV6_DROP_MEMBERSHIP
#endif
#define ALLNODE "ff02::1"