From: Christian Franke <chris@opensourcerouting.org>
Date: Fri, 12 Oct 2018 14:45:32 +0000 (+0200)
Subject: isisd: Address code-style warnings
X-Git-Tag: frr-7.1-dev~278^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=5489eb4563ba1fdf2eef16c8e069cc9fe4c2a8ef;p=mirror%2Ffrr.git

isisd: Address code-style warnings
---

diff --git a/isisd/isis_bfd.c b/isisd/isis_bfd.c
index c9d2ea8e21..40fb6bb7fb 100644
--- a/isisd/isis_bfd.c
+++ b/isisd/isis_bfd.c
@@ -71,8 +71,8 @@ static void bfd_adj_event(struct isis_adjacency *adj, struct prefix *dst,
 		return;
 
 	int old_status = adj->bfd_session->status;
-	adj->bfd_session->status = new_status;
 
+	adj->bfd_session->status = new_status;
 	if (old_status == new_status)
 		return;
 
@@ -108,6 +108,7 @@ static int isis_bfd_interface_dest_update(int command, struct zclient *zclient,
 
 	if (isis->debugs & DEBUG_BFD) {
 		char dst_buf[INET6_ADDRSTRLEN];
+
 		inet_ntop(AF_INET, &dst_ip.u.prefix4,
 			  dst_buf, sizeof(dst_buf));
 
@@ -116,6 +117,7 @@ static int isis_bfd_interface_dest_update(int command, struct zclient *zclient,
 	}
 
 	struct isis_circuit *circuit = circuit_scan_by_ifp(ifp);
+
 	if (!circuit)
 		return 0;
 
@@ -236,6 +238,7 @@ static void bfd_handle_adj_up(struct isis_adjacency *adj, int command)
 		goto out;
 
 	struct list *local_ips = fabricd_ip_addrs(adj->circuit);
+
 	if (!local_ips)
 		goto out;
 
@@ -296,6 +299,7 @@ void isis_bfd_circuit_cmd(struct isis_circuit *circuit, int command)
 
 			struct listnode *node;
 			struct isis_adjacency *adj;
+
 			for (ALL_LIST_ELEMENTS_RO(adjdb, node, adj))
 				bfd_adj_cmd(adj, command);
 		}
diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index 313564d95b..74488a1fcd 100644
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -1142,7 +1142,8 @@ int isis_interface_config_write(struct vty *vty)
 					circuit->passwd.passwd);
 				write++;
 			}
-			write += hook_call(isis_circuit_config_write, circuit, vty);
+			write += hook_call(isis_circuit_config_write,
+					   circuit, vty);
 		}
 		vty_endframe(vty, "!\n");
 	}
diff --git a/isisd/isis_mt.c b/isisd/isis_mt.c
index 1b7fa5a46e..7493b90d33 100644
--- a/isisd/isis_mt.c
+++ b/isisd/isis_mt.c
@@ -302,7 +302,8 @@ circuit_get_mt_setting(struct isis_circuit *circuit, uint16_t mtid)
 	return setting;
 }
 
-static int circuit_write_mt_settings(struct isis_circuit *circuit, struct vty *vty)
+static int circuit_write_mt_settings(struct isis_circuit *circuit,
+				     struct vty *vty)
 {
 	int written = 0;
 	struct listnode *node;
diff --git a/isisd/isis_vty_common.c b/isisd/isis_vty_common.c
index 40e257553d..c211763042 100644
--- a/isisd/isis_vty_common.c
+++ b/isisd/isis_vty_common.c
@@ -507,6 +507,7 @@ DEFUN (isis_bfd,
        "Enable BFD support\n")
 {
 	struct isis_circuit *circuit = isis_circuit_lookup(vty);
+
 	if (!circuit)
 		return CMD_ERR_NO_MATCH;
 
@@ -530,6 +531,7 @@ DEFUN (no_isis_bfd,
 )
 {
 	struct isis_circuit *circuit = isis_circuit_lookup(vty);
+
 	if (!circuit)
 		return CMD_ERR_NO_MATCH;