From 5be57261e8f5e8911acc6c777654139fb9cdf855 Mon Sep 17 00:00:00 2001
From: Bryan Stansell <bryan@conserver.com>
Date: Sun, 18 Oct 2020 23:31:04 -0700
Subject: [PATCH] ran gindent to clean up formatting

---
 conserver/access.c  | 26 ++++++++++++++------------
 conserver/consent.c |  4 ++--
 conserver/cutil.c   |  2 +-
 conserver/group.c   |  2 +-
 console/console.c   | 12 ++++++------
 5 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/conserver/access.c b/conserver/access.c
index adda549..0679a2c 100644
--- a/conserver/access.c
+++ b/conserver/access.c
@@ -67,9 +67,9 @@ AddrCmp(struct in_addr *addr, char *pattern)
     in_addr_t hostaddr, pattern_addr, netmask;
     char *p, *slash_posn;
     static STRING *buf = (STRING *)0;
-# if HAVE_INET_ATON
+#if HAVE_INET_ATON
     struct in_addr inetaddr;
-# endif
+#endif
 
     if (buf == (STRING *)0)
 	buf = AllocString();
@@ -82,15 +82,15 @@ AddrCmp(struct in_addr *addr, char *pattern)
     } else
 	p = pattern;
 
-# if HAVE_INET_ATON
+#if HAVE_INET_ATON
     if (inet_aton(p, &inetaddr) == 0)
 	return 1;
     pattern_addr = inetaddr.s_addr;
-# else
+#else
     pattern_addr = inet_addr(p);
     if (pattern_addr == (in_addr_t) (-1))
 	return 1;		/* malformed address */
-# endif
+#endif
 
     if (slash_posn) {
 	/* convert explicit netmask */
@@ -164,13 +164,15 @@ AccType(INADDR_STYPE *addr, char **peername)
     for (pACtmp = pACList; pACtmp != (ACCESS *)0; pACtmp = pACtmp->pACnext) {
 	CONDDEBUG((1, "AccType(): who=%s, trust=%c", pACtmp->pcwho,
 		   pACtmp->ctrust));
-        if (addr->ss_family == AF_INET && pACtmp->isCIDR != 0) {
-            if (AddrCmp(&(((struct sockaddr_in *)addr)->sin_addr), pACtmp->pcwho) == 0) {
-                ret = pACtmp->ctrust;
-                goto common_ret;
-            }
-            continue;
-        }
+	if (addr->ss_family == AF_INET && pACtmp->isCIDR != 0) {
+	    if (AddrCmp
+		(&(((struct sockaddr_in *)addr)->sin_addr),
+		 pACtmp->pcwho) == 0) {
+		ret = pACtmp->ctrust;
+		goto common_ret;
+	    }
+	    continue;
+	}
 
 	if (strstr(ipaddr, pACtmp->pcwho) != NULL) {
 	    CONDDEBUG((1, "AccType(): match for ip=%s", ipaddr));
diff --git a/conserver/consent.c b/conserver/consent.c
index c9e0134..8ef7199 100644
--- a/conserver/consent.c
+++ b/conserver/consent.c
@@ -885,7 +885,7 @@ ConsInit(CONSENT *pCE)
 #if HAVE_SETSOCKOPT
 		int one = 1;
 #endif
-		Sleep(100000); /* Not all terminal servers can keep up */
+		Sleep(100000);	/* Not all terminal servers can keep up */
 
 #if USE_IPV6
 # if HAVE_MEMSET
@@ -933,7 +933,7 @@ ConsInit(CONSENT *pCE)
 
 			ret = connect(cofile, rp->ai_addr, rp->ai_addrlen);
 			if (ret == 0 || errno == EINPROGRESS)
-				goto success;
+			    goto success;
 
 		      fail:
 			close(cofile);
diff --git a/conserver/cutil.c b/conserver/cutil.c
index c7f198a..342be53 100644
--- a/conserver/cutil.c
+++ b/conserver/cutil.c
@@ -3096,7 +3096,7 @@ void
 Sleep(useconds_t usec)
 {
 #ifdef HAVE_NANOSLEEP
-    struct timespec ts = {0, usec * 1000};
+    struct timespec ts = { 0, usec * 1000 };
     nanosleep(&ts, NULL);
 #else
     usleep(usec);
diff --git a/conserver/group.c b/conserver/group.c
index 7bae3e0..cfdc80e 100644
--- a/conserver/group.c
+++ b/conserver/group.c
@@ -5250,7 +5250,7 @@ Spawn(GRPENT *pGE, int msfd)
 	     * possibly opens another socket to the port.  this really is only
 	     * an issue if you use the same port with -p and -b, i think.
 	     */
-	    Sleep(750000); /* pause 0.75 sec to throttle startup a bit */
+	    Sleep(750000);	/* pause 0.75 sec to throttle startup a bit */
 	    pGE->pid = pid;
 	    return;
 	case 0:
diff --git a/console/console.c b/console/console.c
index 52e4cc6..39daf03 100644
--- a/console/console.c
+++ b/console/console.c
@@ -1473,11 +1473,11 @@ CallUp(CONSFILE *pcf, char *pcMaster, char *pcMach, char *pcHow,
     FilePrint(pcf, FLAGFALSE, "%c%c=", chAttn, chEsc);
     r = ReadReply(pcf, FLAGFALSE);
     if (strncmp(r, "[unknown", 8) != 0 && strncmp(r, "[up]", 4) != 0) {
-	    FileWrite(cfstdout, FLAGFALSE, r, -1);
-	    if (config->exitdown == FLAGTRUE) {
-		    Error("Console is not 'up'. Exiting. (-k)");
-		    Bye(EX_UNAVAILABLE);
-	    }
+	FileWrite(cfstdout, FLAGFALSE, r, -1);
+	if (config->exitdown == FLAGTRUE) {
+	    Error("Console is not 'up'. Exiting. (-k)");
+	    Bye(EX_UNAVAILABLE);
+	}
     }
 
     /* try to grok the version of the server */
@@ -2041,7 +2041,7 @@ main(int argc, char **argv)
 		pcCmd = "info";
 		break;
 
-	case 'k':
+	    case 'k':
 		optConf->exitdown = FLAGTRUE;
 		break;