*: reindent pt. 2

w/ clang 5

* reflow comments
* struct members go 1 per line
* binpack algo was adjusted

5 files changed, 25 insertions, 15 deletions

diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c
index 7f8341d0e..5d344aca7 100644
--- a/ospf6d/ospf6_asbr.c
+++ b/ospf6d/ospf6_asbr.c
@@ -848,7 +848,9 @@ static route_map_result_t ospf6_routemap_rule_match_tag(void *rule,
 }
 
 static struct route_map_rule_cmd ospf6_routemap_rule_match_tag_cmd = {
-	"tag", ospf6_routemap_rule_match_tag, route_map_rule_tag_compile,
+	"tag",
+	ospf6_routemap_rule_match_tag,
+	route_map_rule_tag_compile,
 	route_map_rule_tag_free,
 };
 
@@ -883,7 +885,8 @@ static void ospf6_routemap_rule_set_metric_type_free(void *rule)
 }
 
 struct route_map_rule_cmd ospf6_routemap_rule_set_metric_type_cmd = {
-	"metric-type", ospf6_routemap_rule_set_metric_type,
+	"metric-type",
+	ospf6_routemap_rule_set_metric_type,
 	ospf6_routemap_rule_set_metric_type_compile,
 	ospf6_routemap_rule_set_metric_type_free,
 };
@@ -918,7 +921,8 @@ static void ospf6_routemap_rule_set_metric_free(void *rule)
 }
 
 struct route_map_rule_cmd ospf6_routemap_rule_set_metric_cmd = {
-	"metric", ospf6_routemap_rule_set_metric,
+	"metric",
+	ospf6_routemap_rule_set_metric,
 	ospf6_routemap_rule_set_metric_compile,
 	ospf6_routemap_rule_set_metric_free,
 };
@@ -956,7 +960,8 @@ static void ospf6_routemap_rule_set_forwarding_free(void *rule)
 }
 
 struct route_map_rule_cmd ospf6_routemap_rule_set_forwarding_cmd = {
-	"forwarding-address", ospf6_routemap_rule_set_forwarding,
+	"forwarding-address",
+	ospf6_routemap_rule_set_forwarding,
 	ospf6_routemap_rule_set_forwarding_compile,
 	ospf6_routemap_rule_set_forwarding_free,
 };
@@ -978,7 +983,9 @@ static route_map_result_t ospf6_routemap_rule_set_tag(void *rule,
 }
 
 static struct route_map_rule_cmd ospf6_routemap_rule_set_tag_cmd = {
-	"tag", ospf6_routemap_rule_set_tag, route_map_rule_tag_compile,
+	"tag",
+	ospf6_routemap_rule_set_tag,
+	route_map_rule_tag_compile,
 	route_map_rule_tag_free,
 };
 
diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c
index 1d17a1c23..7921df884 100644
--- a/ospf6d/ospf6_interface.c
+++ b/ospf6d/ospf6_interface.c
@@ -1402,9 +1402,10 @@ DEFUN (ipv6_ospf6_priority,
 
 	oi->priority = strtol(argv[idx_number]->arg, NULL, 10);
 
-	if (oi->area && (oi->state == OSPF6_INTERFACE_DROTHER
-			 || oi->state == OSPF6_INTERFACE_BDR
-			 || oi->state == OSPF6_INTERFACE_DR))
+	if (oi->area
+	    && (oi->state == OSPF6_INTERFACE_DROTHER
+		|| oi->state == OSPF6_INTERFACE_BDR
+		|| oi->state == OSPF6_INTERFACE_DR))
 		ospf6_interface_state_change(dr_election(oi), oi);
 
 	return CMD_SUCCESS;
diff --git a/ospf6d/ospf6_intra.c b/ospf6d/ospf6_intra.c
index 7c5c44fca..66e5714d0 100644
--- a/ospf6d/ospf6_intra.c
+++ b/ospf6d/ospf6_intra.c
@@ -73,8 +73,9 @@ static char *ospf6_router_lsa_get_nbr_id(struct ospf6_lsa *lsa, char *buf,
 
 		lsdesc = (struct ospf6_router_lsdesc
 				  *)(start
-				     + pos * (sizeof(struct
-						     ospf6_router_lsdesc)));
+				     + pos
+					       * (sizeof(struct
+							 ospf6_router_lsdesc)));
 		if ((char *)lsdesc < end) {
 			if (buf && (buflen > INET_ADDRSTRLEN * 2)) {
 				inet_ntop(AF_INET,
diff --git a/ospf6d/ospf6_message.c b/ospf6d/ospf6_message.c
index aa5f05ce1..78f114824 100644
--- a/ospf6d/ospf6_message.c
+++ b/ospf6d/ospf6_message.c
@@ -869,7 +869,7 @@ static unsigned ospf6_prefixes_examin(
 	unsigned length,
 	const u_int32_t req_num_pfxs /* always compared with the actual number
 					of prefixes */
-	)
+)
 {
 	u_char requested_pfx_bytes;
 	u_int32_t real_num_pfxs = 0;
@@ -1066,7 +1066,7 @@ static unsigned ospf6_lsa_examin(struct ospf6_lsa_header *lsah,
 			lsalen - OSPF6_LSA_HEADER_SIZE
 				- OSPF6_LINK_LSA_MIN_SIZE,
 			ntohl(link_lsa->prefix_num) /* 32 bits */
-			);
+		);
 	case OSPF6_LSTYPE_INTRA_PREFIX:
 		/* RFC5340 A.4.10, LSA header + OSPF6_INTRA_PREFIX_LSA_MIN_SIZE
 		   bytes
@@ -1084,7 +1084,7 @@ static unsigned ospf6_lsa_examin(struct ospf6_lsa_header *lsah,
 			lsalen - OSPF6_LSA_HEADER_SIZE
 				- OSPF6_INTRA_PREFIX_LSA_MIN_SIZE,
 			ntohs(intra_prefix_lsa->prefix_num) /* 16 bits */
-			);
+		);
 	}
 	/* No additional validation is possible for unknown LSA types, which are
 	   themselves valid in OPSFv3, hence the default decision is to accept.
@@ -1270,7 +1270,7 @@ static unsigned ospf6_packet_examin(struct ospf6_header *oh,
 						    + OSPF6_LS_UPD_MIN_SIZE),
 			bytesonwire - OSPF6_HEADER_SIZE - OSPF6_LS_UPD_MIN_SIZE,
 			0, ntohl(lsupd->lsa_number) /* 32 bits */
-			);
+		);
 		break;
 	case OSPF6_MESSAGE_TYPE_LSACK:
 		/* RFC5340 A.3.6, packet header + N>=0 header-only LSAs. */
diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c
index d33f41730..84993f0b4 100644
--- a/ospf6d/ospf6_zebra.c
+++ b/ospf6d/ospf6_zebra.c
@@ -347,7 +347,8 @@ static int config_write_ospf6_zebra(struct vty *vty)
 
 /* Zebra node structure. */
 static struct cmd_node zebra_node = {
-	ZEBRA_NODE, "%s(config-zebra)# ",
+	ZEBRA_NODE,
+	"%s(config-zebra)# ",
 };
 
 #define ADD    0