*: strip trailing whitespace

Some of it has snuck by CI

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

diff --git a/babeld/babel_interface.c b/babeld/babel_interface.c
index 6e60300983afce073163d4850cb5061081ae33d0..7f9a13c271ecda57874a739e96142395170ff7bd 100644 (file)
--- a/babeld/babel_interface.c
+++ b/babeld/babel_interface.c
@@ -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) {

diff --git a/bgpd/bgp_bmp.c b/bgpd/bgp_bmp.c
index 551102151e04d54674a4863f37a33f75d2b65d99..ff655048a8cd4fb94608b6b205f0c0a5405ed1dc 100644 (file)
--- a/bgpd/bgp_bmp.c
+++ b/bgpd/bgp_bmp.c
@@ -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);

diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c
index c266440899aecbade12b3121f11e7f8e2462a63d..f31f8cd31bdb5beeb8572c88087f17f1d56b8504 100644 (file)
--- a/bgpd/bgp_snmp.c
+++ b/bgpd/bgp_snmp.c
@@ -46,7 +46,7 @@
 
 /* BGP TRAP. */
 #define BGPESTABLISHED                 1
-#define BGPBACKWARDTRANSITION          2       
+#define BGPBACKWARDTRANSITION          2
 
 /* BGP MIB bgpVersion. */
 #define BGPVERSION                           0

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 17bc83ed2ee14650814a2052f2d48fec7e7a5be7..f290b6cfb4719c70fbdad69034b531bb793df968 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -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))

diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 0a4d73317759c9ee523d7d5482548b3171c821e6..750a36be671e20b2d01b99f9239c19c15de6752e 100644 (file)
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -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   */

diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index ce2a623abb752dccb3c105e6cf380ca96d80347f..eddbc045049af98584848ef71969b7788e1eabc7 100644 (file)
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -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,

diff --git a/lib/printf/printf-pos.c b/lib/printf/printf-pos.c
index 1f5f283e82f69dee56bc25ded9a4d8bbfbe47287..45e4f86229538b632a98f32bb5612b96fdcabb77 100644 (file)
--- a/lib/printf/printf-pos.c
+++ b/lib/printf/printf-pos.c
@@ -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)
 {

diff --git a/lib/typesafe.c b/lib/typesafe.c
index 7e5939d5b3bb084e94e048c88a76805447ed7ff2..6635cf75067c5c78e01a042d94f0e0203a7a1f89 100644 (file)
--- a/lib/typesafe.c
+++ b/lib/typesafe.c
@@ -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;

diff --git a/ospfd/ospf_ase.c b/ospfd/ospf_ase.c
index 9492de544f6d792690d2cf254c82971401e17720..44244f651edcb58dac796e7847c2cd77bfab73f3 100644 (file)
--- a/ospfd/ospf_ase.c
+++ b/ospfd/ospf_ase.c
@@ -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))

diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c
index db41df7c479bb96557f2e25792c52dc418bd9c17..5ab0927e71071f06d5d75fbf144564f6cc510824 100644 (file)
--- a/ospfd/ospf_lsa.c
+++ b/ospfd/ospf_lsa.c
@@ -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 */

diff --git a/pimd/pim_hello.c b/pimd/pim_hello.c
index 721d153d76f7638a051e688f37c8be1ea6a2713f..34c5eb43bc0ab338ec2233025851fc1ca7608a90 100644 (file)
--- a/pimd/pim_hello.c
+++ b/pimd/pim_hello.c
@@ -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);
   }

diff --git a/ripd/rip_snmp.c b/ripd/rip_snmp.c
index 5a6b71fbaaacaa1953b002047b341a9531857d7f..7260a40b19a89c5d92ca70f7c94d9b50e6670ce8 100644 (file)
--- a/ripd/rip_snmp.c
+++ b/ripd/rip_snmp.c
@@ -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

diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c
index a132f723edb3c2bbf835cb585582efffb69bfea1..9209a76460fbe4d3573d9e411ac50923dc23ec5e 100644 (file)
--- a/ripngd/ripng_interface.c
+++ b/ripngd/ripng_interface.c
@@ -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")

diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c
index ef4e474737d58614eecf5169d792cf75382210fa..ad2ddd0dba8a2ace03f0ca269d234bd9c388209f 100644 (file)
--- a/ripngd/ripngd.c
+++ b/ripngd/ripngd.c
@@ -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);
 

diff --git a/tests/lib/test_typelist.h b/tests/lib/test_typelist.h
index 7ff210cae3b1137d7631fcbe55fbf737bc96fe9a..f20bbc52d9bff902b242b0839d66d82de49d4f89 100644 (file)
--- a/tests/lib/test_typelist.h
+++ b/tests/lib/test_typelist.h
@@ -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);
        }

diff --git a/zebra/irdp.h b/zebra/irdp.h
index ff4ab8dfbd2ac9068147cc51359a53296b4c10bf..c1ea34f3aa467e6d7a10ec9076a07bf67fd97b4d 100644 (file)
--- a/zebra/irdp.h
+++ b/zebra/irdp.h
@@ -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;

diff --git a/zebra/rtadv.c b/zebra/rtadv.c
index b084fb99ca1152b888912c5dd436bf80d8bfc36b..2228fcfd3f959a20fd83e9f0bf9dc8b9ce77da3d 100644 (file)
--- a/zebra/rtadv.c
+++ b/zebra/rtadv.c
@@ -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"