pbrd: Cleanup CI warnings

There are a bunch of CI warnings that need to be cleaned up. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
donaldsharp · Mar 16, 2018 · 76b5db9 · 76b5db9
1 parent 178c04d
commit 76b5db9
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 44 deletions.
diff --git a/pbrd/pbr_debug.c b/pbrd/pbr_debug.c
@@ -75,6 +75,7 @@ static void pbr_debug_set_all(uint32_t flags, bool set)
 static uint32_t pbr_debug_check_all(uint32_t flags)
 {
 	uint32_t mode = DEBUG_MODE_ALL;
+
 	for (unsigned int i = 0; i < array_size(pbr_debugs); i++)
 		mode &= DEBUG_MODE_CHECK(pbr_debugs[i], flags);
 	return mode;
@@ -118,6 +119,7 @@ DEFPY(debug_pbr,
       "Events\n")
 {
 	uint32_t mode = DEBUG_NODE2MODE(vty->node);
+
 	if (map)
 		DEBUG_MODE_SET(&pbr_dbg_map, mode, !no);
 	if (zebra)

diff --git a/pbrd/pbr_event.c b/pbrd/pbr_event.c
@@ -40,7 +40,7 @@ struct work_queue *pbr_event_wq;
 static const char *pbr_event_wqentry2str(struct pbr_event *pbre,
 					 char *buffer, size_t buflen)
 {
-	switch(pbre->event) {
+	switch (pbre->event) {
 	case PBR_NHG_NEW:
 		snprintf(buffer, buflen, "Nexthop Group Added %s",
 			 pbre->name);
@@ -197,6 +197,7 @@ void pbr_event_enqueue(struct pbr_event *pbre)
 struct pbr_event *pbr_event_new(enum pbr_events ev, const char *name)
 {
 	struct pbr_event *event;
+
 	event = XCALLOC(MTYPE_PBR_EVENT, sizeof(struct pbr_event));
 	event->event = ev;
 	if (name)

diff --git a/pbrd/pbr_main.c b/pbrd/pbr_main.c
@@ -68,7 +68,7 @@ struct zebra_privs_t pbr_privs = {
 	.cap_num_p = array_size(_caps_p),
 	.cap_num_i = 0};
 
-struct option longopts[] = {{0}};
+struct option longopts[] = { { 0 } };
 
 /* Master of threads. */
 struct thread_master *master;
@@ -122,7 +122,7 @@ FRR_DAEMON_INFO(pbrd, PBR, .vty_port = PBR_VTY_PORT,
 		.signals = pbr_signals,
 		.n_signals = array_size(pbr_signals),
 
-		.privs = &pbr_privs, )
+		.privs = &pbr_privs,)
 
 int main(int argc, char **argv, char **envp)
 {

diff --git a/pbrd/pbr_map.c b/pbrd/pbr_map.c
@@ -45,17 +45,17 @@ DEFINE_MTYPE_STATIC(PBRD, PBR_MAP_INTERFACE, "PBR Map Interface")
 
 static uint32_t pbr_map_sequence_unique;
 
-static __inline int pbr_map_compare(const struct pbr_map *pbrmap1,
-				    const struct pbr_map *pbrmap2);
+static inline int pbr_map_compare(const struct pbr_map *pbrmap1,
+				  const struct pbr_map *pbrmap2);
 
 RB_GENERATE(pbr_map_entry_head, pbr_map, pbr_map_entry, pbr_map_compare)
 
 struct pbr_map_entry_head pbr_maps = RB_INITIALIZER(&pbr_maps);
 
 DEFINE_QOBJ_TYPE(pbr_map_sequence)
 
-static __inline int pbr_map_compare(const struct pbr_map *pbrmap1,
-				    const struct pbr_map *pbrmap2)
+static inline int pbr_map_compare(const struct pbr_map *pbrmap1,
+				  const struct pbr_map *pbrmap2)
 {
 	return strcmp(pbrmap1->name, pbrmap2->name);
 }
@@ -207,8 +207,8 @@ extern void pbr_map_delete(const char *name, uint32_t seqno)
 	}
 }
 
-extern struct pbr_map_sequence *pbrms_lookup_unique(uint32_t unique,
-						    ifindex_t ifindex)
+struct pbr_map_sequence *pbrms_lookup_unique(uint32_t unique,
+					     ifindex_t ifindex)
 {
 	struct pbr_map_sequence *pbrms;
 	struct listnode *snode, *inode;
@@ -234,7 +234,7 @@ extern struct pbr_map_sequence *pbrms_lookup_unique(uint32_t unique,
 	return NULL;
 }
 
-extern struct pbr_map_sequence *pbrms_get(const char *name, uint32_t seqno)
+struct pbr_map_sequence *pbrms_get(const char *name, uint32_t seqno)
 {
 	struct pbr_map *pbrm;
 	struct pbr_map_sequence *pbrms;
@@ -358,7 +358,7 @@ static bool pbr_map_check_valid_internal(struct pbr_map *pbrm)
  * valid config or not.  If so note that it is and return
  * that we are valid.
  */
-extern bool pbr_map_check_valid(const char *name)
+bool pbr_map_check_valid(const char *name)
 {
 	struct pbr_map *pbrm;
 
@@ -374,7 +374,7 @@ extern bool pbr_map_check_valid(const char *name)
 	return pbrm->valid;
 }
 
-extern void pbr_map_schedule_policy_from_nhg(const char *nh_group)
+void pbr_map_schedule_policy_from_nhg(const char *nh_group)
 {
 	struct pbr_map_sequence *pbrms;
 	struct pbr_event *pbre;
@@ -414,7 +414,7 @@ extern void pbr_map_schedule_policy_from_nhg(const char *nh_group)
 	}
 }
 
-extern void pbr_map_policy_install(const char *name)
+void pbr_map_policy_install(const char *name)
 {
 	struct pbr_map_sequence *pbrms;
 	struct pbr_map *pbrm;
@@ -442,7 +442,7 @@ extern void pbr_map_policy_install(const char *name)
 	}
 }
 
-extern void pbr_map_policy_delete(const char *ifname)
+void pbr_map_policy_delete(const char *ifname)
 {
 	struct listnode *node, *nnode;
 	struct pbr_map_interface *pmi;
@@ -469,7 +469,7 @@ extern void pbr_map_policy_delete(const char *ifname)
  * valid for usage.  If we are valid then schedule the installation/deletion
  * of the pbr-policy.
  */
-extern void pbr_map_check_nh_group_change(const char *nh_group)
+void pbr_map_check_nh_group_change(const char *nh_group)
 {
 	struct pbr_map_sequence *pbrms;
 	struct pbr_map *pbrm;
@@ -489,8 +489,6 @@ extern void pbr_map_check_nh_group_change(const char *nh_group)
 
 			if (found_name) {
 				bool original = pbrm->valid;
-				zlog_warn("*** %s pbrm->valid is %u ***",
-					  __func__, pbrm->valid);
 
 				pbr_map_check_valid_internal(pbrm);
 
@@ -507,7 +505,7 @@ extern void pbr_map_check_nh_group_change(const char *nh_group)
 	}
 }
 
-extern void pbr_map_check(const char *name, uint32_t seqno)
+void pbr_map_check(const char *name, uint32_t seqno)
 {
 	struct pbr_map_sequence *pbrms;
 	struct listnode *node;
@@ -556,7 +554,7 @@ extern void pbr_map_check(const char *name, uint32_t seqno)
 	}
 }
 
-extern void pbr_map_install(const char *name)
+void pbr_map_install(const char *name)
 {
 	struct pbr_map *pbrm;
 
@@ -575,7 +573,7 @@ extern void pbr_map_install(const char *name)
 	pbrm->installed = true;
 }
 
-extern void pbr_map_add_interfaces(const char *name)
+void pbr_map_add_interfaces(const char *name)
 {
 	struct pbr_map *pbrm;
 	struct interface *ifp;
@@ -591,7 +589,7 @@ extern void pbr_map_add_interfaces(const char *name)
 	}
 
 	RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
-                FOR_ALL_INTERFACES (vrf, ifp) {
+		FOR_ALL_INTERFACES (vrf, ifp) {
 			if (ifp->info) {
 				pbr_ifp = ifp->info;
 				if (strcmp(name, pbr_ifp->mapname) == 0)
@@ -601,8 +599,7 @@ extern void pbr_map_add_interfaces(const char *name)
 	}
 }
 
-
-extern void pbr_map_check_policy_change(const char *name)
+void pbr_map_check_policy_change(const char *name)
 {
 	struct pbr_map *pbrm;
 
@@ -624,7 +621,7 @@ extern void pbr_map_check_policy_change(const char *name)
 	}
 }
 
-extern void pbr_map_init(void)
+void pbr_map_init(void)
 {
 	RB_INIT(pbr_map_entry_head, &pbr_maps);
 

diff --git a/pbrd/pbr_nht.c b/pbrd/pbr_nht.c
@@ -222,6 +222,7 @@ static afi_t pbr_nht_which_afi(struct nexthop_group nhg)
 	struct nexthop *nexthop;
 	afi_t install_afi = AFI_MAX;
 	bool v6, v4, bh;
+
 	v6 = v4 = bh = false;
 
 	for (ALL_NEXTHOPS(nhg, nexthop)) {
@@ -639,9 +640,8 @@ bool pbr_nht_get_installed(const char *name)
 
 	pnhgc = hash_lookup(pbr_nhg_hash, &find);
 
-	if (!pnhgc) {
+	if (!pnhgc)
 		return false;
-	}
 
 	return pnhgc->installed;
 }

diff --git a/pbrd/pbr_vty.c b/pbrd/pbr_vty.c
@@ -496,7 +496,7 @@ DEFPY (show_pbr_interface,
 	"PBR Interface Name\n"
 	JSON_STR)
 {
-        struct interface *ifp;
+	struct interface *ifp;
 	struct vrf *vrf;
 	struct pbr_interface *pbr_ifp;
 
@@ -559,16 +559,16 @@ static int pbr_vty_map_config_write_sequence(struct vty *vty,
 {
 	char buff[PREFIX_STRLEN];
 
-	vty_out (vty, "pbr-map %s seq %u\n",
-		 pbrm->name, pbrms->seqno);
+	vty_out(vty, "pbr-map %s seq %u\n",
+		pbrm->name, pbrms->seqno);
 
 	if (pbrms->src)
 		vty_out(vty, "  match src-ip %s\n",
-			prefix2str(pbrms->src, buff, sizeof buff));
+			prefix2str(pbrms->src, buff, sizeof(buff)));
 
 	if (pbrms->dst)
 		vty_out(vty, "  match dst-ip %s\n",
-			prefix2str(pbrms->dst, buff, sizeof buff));
+			prefix2str(pbrms->dst, buff, sizeof(buff)));
 
 	if (pbrms->nhgrp_name)
 		vty_out(vty, "  set nexthop-group %s\n", pbrms->nhgrp_name);
@@ -578,7 +578,7 @@ static int pbr_vty_map_config_write_sequence(struct vty *vty,
 		nexthop_group_write_nexthop(vty, pbrms->nhg->nexthop);
 	}
 
-	vty_out (vty, "!\n");
+	vty_out(vty, "!\n");
 	return 1;
 }
 
@@ -593,9 +593,8 @@ static int pbr_vty_map_config_write(struct vty *vty)
 		struct pbr_map_sequence *pbrms;
 		struct listnode *node;
 
-		for (ALL_LIST_ELEMENTS_RO(pbrm->seqnumbers, node, pbrms)) {
+		for (ALL_LIST_ELEMENTS_RO(pbrm->seqnumbers, node, pbrms))
 			pbr_vty_map_config_write_sequence(vty, pbrm, pbrms);
-		}
 	}
 
 	return 1;
@@ -627,6 +626,4 @@ void pbr_vty_init(void)
 	install_element(VIEW_NODE, &show_pbr_nexthop_group_cmd);
 
 	pbr_debug_init_vty();
-
-	return;
 }
diff --git a/pbrd/pbr_zebra.c b/pbrd/pbr_zebra.c
@@ -45,10 +45,7 @@
 DEFINE_MTYPE_STATIC(PBRD, PBR_INTERFACE, "PBR Interface")
 
 /* Zebra structure to hold current status. */
-struct zclient *zclient = NULL;
-
-/* For registering threads. */
-extern struct thread_master *master;
+struct zclient *zclient;
 
 static struct interface *zebra_interface_if_lookup(struct stream *s)
 {
@@ -370,8 +367,6 @@ void route_delete(struct pbr_nexthop_group_cache *pnhgc, afi_t afi)
 		       __PRETTY_FUNCTION__);
 		break;
 	}
-
-	return;
 }
 
 static int pbr_zebra_nexthop_update(int command, struct zclient *zclient,
@@ -435,7 +430,7 @@ void pbr_send_rnh(struct nexthop *nhop, bool reg)
 		ZEBRA_NEXTHOP_REGISTER : ZEBRA_NEXTHOP_UNREGISTER;
 
 	memset(&p, 0, sizeof(p));
-	switch(nhop->type) {
+	switch (nhop->type) {
 	case NEXTHOP_TYPE_IFINDEX:
 	case NEXTHOP_TYPE_BLACKHOLE:
 		return;
@@ -544,7 +539,7 @@ void pbr_send_pbr_map(struct pbr_map *pbrm, bool install)
 
 		for (ALL_LIST_ELEMENTS_RO(pbrm->seqnumbers, snode, pbrms)) {
 
-			DEBUGD(&pbr_dbg_zebra, "%s: \tSeqno: %u %ld valid %u",
+			DEBUGD(&pbr_dbg_zebra, "%s: \tSeqno: %u %" PRIu64 " valid %u",
 			       __PRETTY_FUNCTION__, pbrms->seqno, pbrms->reason,
 			       pbrm->valid);
 

diff --git a/pbrd/pbr_zebra.h b/pbrd/pbr_zebra.h
@@ -26,6 +26,8 @@ struct pbr_interface {
 	char mapname[100];
 };
 
+extern struct thread_master *master;
+
 extern void pbr_zebra_init(void);
 
 extern void route_add(struct pbr_nexthop_group_cache *pnhgc,