*: reindentreindent-3.0-after

indent.py `git ls-files | pcregrep '\.[ch]$' | pcregrep -v '^(ldpd|babeld|nhrpd)/'`

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

1 files changed, 51 insertions, 56 deletions

diff --git a/bgpd/rfapi/rfapi_descriptor_rfp_utils.c b/bgpd/rfapi/rfapi_descriptor_rfp_utils.c
index 8106186d97..6f3facff33 100644
--- a/bgpd/rfapi/rfapi_descriptor_rfp_utils.c
+++ b/bgpd/rfapi/rfapi_descriptor_rfp_utils.c
@@ -1,4 +1,4 @@
-/* 
+/*
  *
  * Copyright 2009-2016, LabN Consulting, L.L.C.
  *
@@ -37,15 +37,14 @@
 #include "bgpd/rfapi/vnc_debug.h"
 
 
-void *
-rfapi_create_generic (struct rfapi_ip_addr *vn, struct rfapi_ip_addr *un)
+void *rfapi_create_generic(struct rfapi_ip_addr *vn, struct rfapi_ip_addr *un)
 {
-  struct rfapi_descriptor *rfd;
-  rfd = XCALLOC (MTYPE_RFAPI_DESC, sizeof (struct rfapi_descriptor));
-  vnc_zlog_debug_verbose ("%s: rfd=%p", __func__, rfd);
-  rfd->vn_addr = *vn;
-  rfd->un_addr = *un;
-  return (void *) rfd;
+	struct rfapi_descriptor *rfd;
+	rfd = XCALLOC(MTYPE_RFAPI_DESC, sizeof(struct rfapi_descriptor));
+	vnc_zlog_debug_verbose("%s: rfd=%p", __func__, rfd);
+	rfd->vn_addr = *vn;
+	rfd->un_addr = *un;
+	return (void *)rfd;
 }
 
 /*------------------------------------------
@@ -53,20 +52,19 @@ rfapi_create_generic (struct rfapi_ip_addr *vn, struct rfapi_ip_addr *un)
  *
  * Compare two generic rfapi descriptors.
  *
- * input: 
+ * input:
  *    grfd: rfapi descriptor returned by rfapi_open or rfapi_create_generic
  *
  * output:
  *
- * return value: 
+ * return value:
  *
  *------------------------------------------*/
-void
-rfapi_free_generic (void *grfd)
+void rfapi_free_generic(void *grfd)
 {
-  struct rfapi_descriptor *rfd;
-  rfd = (struct rfapi_descriptor *) grfd;
-  XFREE (MTYPE_RFAPI_DESC, rfd);
+	struct rfapi_descriptor *rfd;
+	rfd = (struct rfapi_descriptor *)grfd;
+	XFREE(MTYPE_RFAPI_DESC, rfd);
 }
 
 
@@ -75,7 +73,7 @@ rfapi_free_generic (void *grfd)
  *
  * Compare two generic rfapi descriptors.
  *
- * input: 
+ * input:
  *    rfd1: rfapi descriptor returned by rfapi_open or rfapi_create_generic
  *    rfd2: rfapi descriptor returned by rfapi_open or rfapi_create_generic
  *
@@ -85,48 +83,45 @@ rfapi_free_generic (void *grfd)
  *	0		Mismatch
  *	1		Match
  *------------------------------------------*/
-int
-rfapi_compare_rfds (void *rfd1, void *rfd2)
+int rfapi_compare_rfds(void *rfd1, void *rfd2)
 {
-  struct rfapi_descriptor *rrfd1, *rrfd2;
-  int match = 0;
+	struct rfapi_descriptor *rrfd1, *rrfd2;
+	int match = 0;
 
-  rrfd1 = (struct rfapi_descriptor *) rfd1;
-  rrfd2 = (struct rfapi_descriptor *) rfd2;
+	rrfd1 = (struct rfapi_descriptor *)rfd1;
+	rrfd2 = (struct rfapi_descriptor *)rfd2;
 
-  if (rrfd1->vn_addr.addr_family == rrfd2->vn_addr.addr_family)
-    {
-      if (rrfd1->vn_addr.addr_family == AF_INET)
-        match = IPV4_ADDR_SAME (&(rrfd1->vn_addr.addr.v4),
-                                &(rrfd2->vn_addr.addr.v4));
-      else
-        match = IPV6_ADDR_SAME (&(rrfd1->vn_addr.addr.v6),
-                                &(rrfd2->vn_addr.addr.v6));
-    }
+	if (rrfd1->vn_addr.addr_family == rrfd2->vn_addr.addr_family) {
+		if (rrfd1->vn_addr.addr_family == AF_INET)
+			match = IPV4_ADDR_SAME(&(rrfd1->vn_addr.addr.v4),
+					       &(rrfd2->vn_addr.addr.v4));
+		else
+			match = IPV6_ADDR_SAME(&(rrfd1->vn_addr.addr.v6),
+					       &(rrfd2->vn_addr.addr.v6));
+	}
 
-  /* 
-   * If the VN addresses don't match in all forms, 
-   * give up.
-   */
-  if (!match)
-    return 0;
+	/*
+	 * If the VN addresses don't match in all forms,
+	 * give up.
+	 */
+	if (!match)
+		return 0;
 
-  /* 
-   * do the process again for the UN addresses. 
-   */
-  match = 0;
-  if (rrfd1->un_addr.addr_family == rrfd2->un_addr.addr_family)
-    {
-      /* VN addresses match
-       * UN address families match 
-       * now check the actual UN addresses
-       */
-      if (rrfd1->un_addr.addr_family == AF_INET)
-        match = IPV4_ADDR_SAME (&(rrfd1->un_addr.addr.v4),
-                                &(rrfd2->un_addr.addr.v4));
-      else
-        match = IPV6_ADDR_SAME (&(rrfd1->un_addr.addr.v6),
-                                &(rrfd2->un_addr.addr.v6));
-    }
-  return match;
+	/*
+	 * do the process again for the UN addresses.
+	 */
+	match = 0;
+	if (rrfd1->un_addr.addr_family == rrfd2->un_addr.addr_family) {
+		/* VN addresses match
+		 * UN address families match
+		 * now check the actual UN addresses
+		 */
+		if (rrfd1->un_addr.addr_family == AF_INET)
+			match = IPV4_ADDR_SAME(&(rrfd1->un_addr.addr.v4),
+					       &(rrfd2->un_addr.addr.v4));
+		else
+			match = IPV6_ADDR_SAME(&(rrfd1->un_addr.addr.v6),
+					       &(rrfd2->un_addr.addr.v6));
+	}
+	return match;
 }