]> git.puffer.fish Git - mirror/frr.git/commitdiff
isisd: Address code-style warnings
authorChristian Franke <chris@opensourcerouting.org>
Fri, 12 Oct 2018 14:45:32 +0000 (16:45 +0200)
committerChristian Franke <chris@opensourcerouting.org>
Fri, 12 Oct 2018 14:45:32 +0000 (16:45 +0200)
isisd/isis_bfd.c
isisd/isis_circuit.c
isisd/isis_mt.c
isisd/isis_vty_common.c

index c9d2ea8e21c92c91859d56c67f69a58701819b39..40fb6bb7fb00e52e1ab59bb4a79e226a66d0e36e 100644 (file)
@@ -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);
                }
index 313564d95ba35646687177d73410037696e5b98b..74488a1fcd8ee033bbe7c4a5e2673e3085d3936a 100644 (file)
@@ -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");
        }
index 1b7fa5a46e360e7fa5937089720cfd4235e8431b..7493b90d33638a63e8c812c86db1a2c3aa6031f2 100644 (file)
@@ -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;
index 40e257553dbe18467aef9506c96b7dccaed928e5..c211763042821b8f2664b5bcf4a5e2df1eb59a87 100644 (file)
@@ -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;