]> git.puffer.fish Git - mirror/frr.git/commitdiff
OSPFd: Correct style
authorOlivier Dugeon <olivier.dugeon@orange.com>
Thu, 22 Feb 2018 09:29:25 +0000 (10:29 +0100)
committerOlivier Dugeon <olivier.dugeon@orange.com>
Thu, 22 Feb 2018 09:29:25 +0000 (10:29 +0100)
 - Correct style warning and errors detected by checkpatch.pl

Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
ospfd/ospf_opaque.c
ospfd/ospf_sr.c

index 009fd997eab9a34beea663b7fb7a879474d92f87..4417f42b3caf14baf01aa0471f4d3d850f70814e 100644 (file)
@@ -610,28 +610,28 @@ static void free_opaque_info_owner(void *val)
 {
        struct opaque_info_per_type *oipt = (struct opaque_info_per_type *)val;
 
-        switch (oipt->lsa_type) {
-        case OSPF_OPAQUE_LINK_LSA: {
-                struct ospf_interface *oi =
-                        (struct ospf_interface *)(oipt->owner);
-                listnode_delete(oi->opaque_lsa_self, oipt);
-                break;
-        }
-        case OSPF_OPAQUE_AREA_LSA: {
-                struct ospf_area *area = (struct ospf_area *)(oipt->owner);
-                listnode_delete(area->opaque_lsa_self, oipt);
-                break;
-        }
-        case OSPF_OPAQUE_AS_LSA: {
-                struct ospf *top = (struct ospf *)(oipt->owner);
-                listnode_delete(top->opaque_lsa_self, oipt);
-                break;
-        }
-        default:
-                zlog_warn("free_opaque_info_owner: Unexpected LSA-type(%u)",
-                          oipt->lsa_type);
-                break; /* This case may not exist. */
-        }
+       switch (oipt->lsa_type) {
+       case OSPF_OPAQUE_LINK_LSA: {
+               struct ospf_interface *oi =
+                       (struct ospf_interface *)(oipt->owner);
+               listnode_delete(oi->opaque_lsa_self, oipt);
+               break;
+       }
+       case OSPF_OPAQUE_AREA_LSA: {
+               struct ospf_area *area = (struct ospf_area *)(oipt->owner);
+               listnode_delete(area->opaque_lsa_self, oipt);
+               break;
+       }
+       case OSPF_OPAQUE_AS_LSA: {
+               struct ospf *top = (struct ospf *)(oipt->owner);
+               listnode_delete(top->opaque_lsa_self, oipt);
+               break;
+       }
+       default:
+               zlog_warn("free_opaque_info_owner: Unexpected LSA-type(%u)",
+                       oipt->lsa_type);
+               break; /* This case may not exist. */
+       }
 }
 
 static void free_opaque_info_per_type(void *val)
index 3dc18e6e348a3411306fff399a5975602ac045bb..0cdd464a26494d4c6c8bb9e29ce2c3e79f246785 100644 (file)
@@ -2170,6 +2170,7 @@ static void show_sr_node(struct vty *vty, struct json_object *json,
                                continue;
                        json_obj = json_object_new_object();
                        char tmp[2];
+
                        snprintf(tmp, 2, "%u", i);
                        json_object_string_add(json_obj, tmp,
                                srn->algo[i] == SR_ALGORITHM_SPF ?
@@ -2355,7 +2356,8 @@ DEFUN (show_ip_opsf_srdb,
                        inet_ntoa(OspfSR.self->adv_router));
                json_object_object_add(json, "srNodes", json_node_array);
        } else {
-               vty_out(vty, "\n          OSPF Segment Routing database for ID %s\n\n",
+               vty_out(vty,
+                       "\n\t\tOSPF Segment Routing database for ID %s\n\n",
                        inet_ntoa(OspfSR.self->adv_router));
        }