From 60cccb1237496b724e0ce98f47392cd1898c59c2 Mon Sep 17 00:00:00 2001
From: Nathan Neulinger <nneul@umr.edu>
Date: Fri, 5 Oct 2001 22:23:58 +0000
Subject: [PATCH] auth-warning-cleanup-20011005

add headers, parens, and braces
---
 src/auth/cellconfig.c  | 39 +++++++++++++++++++++++++--------------
 src/auth/ktc.c         | 10 ++++++++++
 src/auth/writeconfig.c | 16 +++++++++++++---
 3 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/src/auth/cellconfig.c b/src/auth/cellconfig.c
index cd4c38d1d..ed47eeb10 100644
--- a/src/auth/cellconfig.c
+++ b/src/auth/cellconfig.c
@@ -39,8 +39,19 @@ RCSID("$Header$");
 #include <ctype.h>
 #include <time.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 #endif /* UKERNEL */
 #include <afs/afsutil.h>
 #include "cellconfig.h"
@@ -53,19 +64,19 @@ static afsconf_CloseInternal();
 static afsconf_Reopen();
 
 static struct afsconf_servPair serviceTable [] = {
-    "afs",	7000,
-    "afscb",	7001,
-    "afsprot",	7002,
-    "afsvldb",	7003,
-    "afskauth",	7004,
-    "afsvol",	7005,
-    "afserror",	7006,
-    "afsnanny",	7007,
-    "afsupdate",7008,
-    "afsrmtsys",7009,
-    "afsres",   7010,   /* residency database for MR-AFS */
-    "afsremio", 7011,   /* remote I/O interface for MR-AFS */
-    0, 0		/* insert new services before this spot */
+    { "afs",       7000, },
+    { "afscb",     7001, },
+    { "afsprot",   7002, },
+    { "afsvldb",   7003, },
+    { "afskauth",  7004, },
+    { "afsvol",    7005, },
+    { "afserror",  7006, },
+    { "afsnanny",  7007, },
+    { "afsupdate", 7008, },
+    { "afsrmtsys", 7009, },
+    { "afsres",    7010, },  /* residency database for MR-AFS */
+    { "afsremio",  7011, },  /* remote I/O interface for MR-AFS */
+    { 0, 0 }		     /* insert new services before this spot */
 };
 
 /*
@@ -106,7 +117,7 @@ char *abuffer; {
     register int tc;
 
     tp = abuffer;
-    while (tc = *tp) {
+    while ((tc = *tp)) {
 	if (!isspace(tc)) break;
 	tp++;
     }
diff --git a/src/auth/ktc.c b/src/auth/ktc.c
index a4ad0bb72..e208ac8e3 100644
--- a/src/auth/ktc.c
+++ b/src/auth/ktc.c
@@ -48,10 +48,20 @@ RCSID("$Header$");
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <netinet/in.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
 #include <afs/vice.h>
 #ifdef	AFS_AIX_ENV
 #include <sys/lockf.h>
 #endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 #include "auth.h"
 #include <afs/venus.h>
 #include <afs/afsutil.h>
diff --git a/src/auth/writeconfig.c b/src/auth/writeconfig.c
index e5b08b054..aafb8fedd 100644
--- a/src/auth/writeconfig.c
+++ b/src/auth/writeconfig.c
@@ -15,9 +15,6 @@ RCSID("$Header$");
 #include <afs/pthread_glock.h>
 #include <afs/afsutil.h>
 #include <sys/types.h>
-#ifdef AFS_SUN5_ENV 
-#include <fcntl.h>
-#endif
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
 #include <fcntl.h>
@@ -30,6 +27,19 @@ RCSID("$Header$");
 #endif
 #include <stdio.h>
 #include <errno.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 #include "cellconfig.h"
 #include "keys.h"
 
-- 
2.39.5