Revert "*: reindent pt. 2"

This reverts commit c14777c6bfd0a446c85243d3a9835054a259c276.

clang 5 is not widely available enough for people to indent with.  This
is particularly problematic when rebasing/adjusting branches.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

1 files changed, 38 insertions, 39 deletions

diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index c72e290032..98508aaa89 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -68,17 +68,17 @@ static const struct {
 	int key;
 	int distance;
 } route_info[ZEBRA_ROUTE_MAX] = {
-	[ZEBRA_ROUTE_SYSTEM] = {ZEBRA_ROUTE_SYSTEM, 0},
-	[ZEBRA_ROUTE_KERNEL] = {ZEBRA_ROUTE_KERNEL, 0},
-	[ZEBRA_ROUTE_CONNECT] = {ZEBRA_ROUTE_CONNECT, 0},
-	[ZEBRA_ROUTE_STATIC] = {ZEBRA_ROUTE_STATIC, 1},
-	[ZEBRA_ROUTE_RIP] = {ZEBRA_ROUTE_RIP, 120},
-	[ZEBRA_ROUTE_RIPNG] = {ZEBRA_ROUTE_RIPNG, 120},
-	[ZEBRA_ROUTE_OSPF] = {ZEBRA_ROUTE_OSPF, 110},
-	[ZEBRA_ROUTE_OSPF6] = {ZEBRA_ROUTE_OSPF6, 110},
-	[ZEBRA_ROUTE_ISIS] = {ZEBRA_ROUTE_ISIS, 115},
-	[ZEBRA_ROUTE_BGP] = {ZEBRA_ROUTE_BGP, 20 /* IBGP is 200. */},
-	[ZEBRA_ROUTE_NHRP] = {ZEBRA_ROUTE_NHRP, 10},
+		[ZEBRA_ROUTE_SYSTEM] = {ZEBRA_ROUTE_SYSTEM, 0},
+		[ZEBRA_ROUTE_KERNEL] = {ZEBRA_ROUTE_KERNEL, 0},
+		[ZEBRA_ROUTE_CONNECT] = {ZEBRA_ROUTE_CONNECT, 0},
+		[ZEBRA_ROUTE_STATIC] = {ZEBRA_ROUTE_STATIC, 1},
+		[ZEBRA_ROUTE_RIP] = {ZEBRA_ROUTE_RIP, 120},
+		[ZEBRA_ROUTE_RIPNG] = {ZEBRA_ROUTE_RIPNG, 120},
+		[ZEBRA_ROUTE_OSPF] = {ZEBRA_ROUTE_OSPF, 110},
+		[ZEBRA_ROUTE_OSPF6] = {ZEBRA_ROUTE_OSPF6, 110},
+		[ZEBRA_ROUTE_ISIS] = {ZEBRA_ROUTE_ISIS, 115},
+		[ZEBRA_ROUTE_BGP] = {ZEBRA_ROUTE_BGP, 20 /* IBGP is 200. */},
+		[ZEBRA_ROUTE_NHRP] = {ZEBRA_ROUTE_NHRP, 10},
 	/* no entry/default: 150 */
 };
 
@@ -1551,9 +1551,8 @@ static void rib_process(struct route_node *rn)
 
 	/* Buffer ROUTE_ENTRY_CHANGED here, because it will get cleared if
 	 * fib == selected */
-	bool selected_changed =
-		new_selected
-		&& CHECK_FLAG(new_selected->status, ROUTE_ENTRY_CHANGED);
+	bool selected_changed = new_selected && CHECK_FLAG(new_selected->status,
+							   ROUTE_ENTRY_CHANGED);
 
 	/* Update fib according to selection results */
 	if (new_fib && old_fib)
@@ -1726,30 +1725,30 @@ static wq_item_status meta_queue_process(struct work_queue *dummy, void *data)
  * Map from rib types to queue type (priority) in meta queue
  */
 static const u_char meta_queue_map[ZEBRA_ROUTE_MAX] = {
-	[ZEBRA_ROUTE_SYSTEM] = 4,
-	[ZEBRA_ROUTE_KERNEL] = 0,
-	[ZEBRA_ROUTE_CONNECT] = 0,
-	[ZEBRA_ROUTE_STATIC] = 1,
-	[ZEBRA_ROUTE_RIP] = 2,
-	[ZEBRA_ROUTE_RIPNG] = 2,
-	[ZEBRA_ROUTE_OSPF] = 2,
-	[ZEBRA_ROUTE_OSPF6] = 2,
-	[ZEBRA_ROUTE_ISIS] = 2,
-	[ZEBRA_ROUTE_BGP] = 3,
-	[ZEBRA_ROUTE_PIM] = 4, // Shouldn't happen but for safety
-	[ZEBRA_ROUTE_EIGRP] = 2,
-	[ZEBRA_ROUTE_NHRP] = 2,
-	[ZEBRA_ROUTE_HSLS] = 4,
-	[ZEBRA_ROUTE_OLSR] = 4,
-	[ZEBRA_ROUTE_TABLE] = 1,
-	[ZEBRA_ROUTE_LDP] = 4,
-	[ZEBRA_ROUTE_VNC] = 3,
-	[ZEBRA_ROUTE_VNC_DIRECT] = 3,
-	[ZEBRA_ROUTE_VNC_DIRECT_RH] = 3,
-	[ZEBRA_ROUTE_BGP_DIRECT] = 3,
-	[ZEBRA_ROUTE_BGP_DIRECT_EXT] = 3,
-	[ZEBRA_ROUTE_BABEL] = 2,
-	[ZEBRA_ROUTE_ALL] = 4, // Shouldn't happen but for safety
+		[ZEBRA_ROUTE_SYSTEM] = 4,
+		[ZEBRA_ROUTE_KERNEL] = 0,
+		[ZEBRA_ROUTE_CONNECT] = 0,
+		[ZEBRA_ROUTE_STATIC] = 1,
+		[ZEBRA_ROUTE_RIP] = 2,
+		[ZEBRA_ROUTE_RIPNG] = 2,
+		[ZEBRA_ROUTE_OSPF] = 2,
+		[ZEBRA_ROUTE_OSPF6] = 2,
+		[ZEBRA_ROUTE_ISIS] = 2,
+		[ZEBRA_ROUTE_BGP] = 3,
+		[ZEBRA_ROUTE_PIM] = 4, // Shouldn't happen but for safety
+		[ZEBRA_ROUTE_EIGRP] = 2,
+		[ZEBRA_ROUTE_NHRP] = 2,
+		[ZEBRA_ROUTE_HSLS] = 4,
+		[ZEBRA_ROUTE_OLSR] = 4,
+		[ZEBRA_ROUTE_TABLE] = 1,
+		[ZEBRA_ROUTE_LDP] = 4,
+		[ZEBRA_ROUTE_VNC] = 3,
+		[ZEBRA_ROUTE_VNC_DIRECT] = 3,
+		[ZEBRA_ROUTE_VNC_DIRECT_RH] = 3,
+		[ZEBRA_ROUTE_BGP_DIRECT] = 3,
+		[ZEBRA_ROUTE_BGP_DIRECT_EXT] = 3,
+		[ZEBRA_ROUTE_BABEL] = 2,
+		[ZEBRA_ROUTE_ALL] = 4, // Shouldn't happen but for safety
 };
 
 /* Look into the RN and queue it into one or more priority queues,
@@ -2396,7 +2395,7 @@ void rib_delete(afi_t afi, safi_t safi, vrf_id_t vrf_id, int type,
 							family2afi(afi), gate,
 							buf2,
 							INET_ADDRSTRLEN), /* FIXME
-									   */
+									     */
 						ifindex, type);
 				else
 					rnode_debug(