ptserver: Tidy header includes

Since we adopted libroken, we get a lot of header includes automatically
from roken.h. Use these, instead of including lots of things multiple
times.

Also reorder our headers so that they go

 #include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h> (if required)

 #include <roken.h>

 [ ... out of directory headers ... ]

 [ ... local headers ... ]

Change-Id: I9214f6bf65085947cfc588b47484e1b022ffc5b1
Reviewed-on: http://gerrit.openafs.org/4299
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/ptserver/db_verify.c b/src/ptserver/db_verify.c
index 230eb38..1a51a40 100644 (file)
--- a/src/ptserver/db_verify.c
+++ b/src/ptserver/db_verify.c
@@ -7,9 +7,9 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
@@ -31,21 +31,13 @@
  *                          conditions.
  */
 
-#include <afs/stds.h>
-#include <sys/types.h>
+
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <WINNT/afsevent.h>
-#include <io.h>
 #else
-#include <netdb.h>
-#include <netinet/in.h>
 #include <sys/file.h>
 #endif
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <fcntl.h>
+
 #include <afs/cellconfig.h>
 #include <afs/afsutil.h>
 #include <ubik.h>

diff --git a/src/ptserver/display.c b/src/ptserver/display.c
index 281860e..bc93420 100644 (file)
--- a/src/ptserver/display.c
+++ b/src/ptserver/display.c
@@ -9,27 +9,21 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#include <sys/types.h>
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
 #else
 #include <netinet/in.h>
 #endif
-#include <string.h>
-#include <stdio.h>
-#include "ptserver.h"
 
+#include "ptserver.h"
 #include "display.h"
 
 #ifdef PR_REMEMBER_TIMES
 
-# include <time.h>
-
-
 static char *
 pr_TimeToString(time_t clock)
 {

diff --git a/src/ptserver/map.c b/src/ptserver/map.c
index c823516..9c74bc8 100644 (file)
--- a/src/ptserver/map.c
+++ b/src/ptserver/map.c
@@ -31,14 +31,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef SUPERGROUPS
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
 #include "map.h"
 
 #undef PRINT_MAP_ERROR

diff --git a/src/ptserver/pt_util.c b/src/ptserver/pt_util.c
index cd08f64..9c0e0a4 100644 (file)
--- a/src/ptserver/pt_util.c
+++ b/src/ptserver/pt_util.c
@@ -13,39 +13,25 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+
 #include <roken.h>
 
-#include <sys/types.h>
 #ifndef _WIN32
-#include <sys/time.h>
 #include <sys/file.h>
 #else
-#include <fcntl.h>
-#include <io.h>
 #define L_SET SEEK_SET
 #endif
-#include <stdio.h>
 #include <ctype.h>
-#include <string.h>
-#include <errno.h>
 
-#include <afsconfig.h>
-#include <afs/param.h>
 #include <afs/com_err.h>
-
-
 #include <afs/cmd.h>           /*Command line parsing */
 #include <afs/afsutil.h>
-#include <errno.h>
 #include <lock.h>
-#ifndef _WIN32
-#include <netinet/in.h>
-#endif
 #define UBIK_INTERNALS
 #include <ubik.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
-#include <afs/com_err.h>
+
 #include "ptint.h"
 #include "ptserver.h"
 #include "pterror.h"

diff --git a/src/ptserver/ptclient.c b/src/ptserver/ptclient.c
index bbcdbaf..efae5c3 100644 (file)
--- a/src/ptserver/ptclient.c
+++ b/src/ptserver/ptclient.c
@@ -9,33 +9,24 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#ifdef AFS_AIX32_ENV
-#include <signal.h>
-#endif
-#include <sys/types.h>
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <WINNT/afsevent.h>
-#else
-#include <netinet/in.h>
-#include <netdb.h>
 #endif
-#include <stdio.h>
+
 #include <rx/xdr.h>
 #include <rx/rx.h>
-#include <string.h>
-#include <afs/stds.h>
 #include <afs/com_err.h>
 #include <afs/cellconfig.h>
+#include <afs/afsutil.h>
+
 #include "ptclient.h"
 #include "ptuser.h"
 #include "pterror.h"
 #include "display.h"
-#include <afs/afsutil.h>
-
 
 afs_int32 security = 0;
 char confdir[AFSDIR_PATH_MAX];

diff --git a/src/ptserver/ptprocs.c b/src/ptserver/ptprocs.c
index 2528ca5..570a0bd 100644 (file)
--- a/src/ptserver/ptprocs.c
+++ b/src/ptserver/ptprocs.c
@@ -49,12 +49,12 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
 #include <ctype.h>
-#include <stdio.h>
+
 #include <lock.h>
 #include <afs/afsutil.h>
 #include <ubik.h>
@@ -62,13 +62,7 @@
 #include <rx/rx.h>
 #include <rx/rxkad.h>
 #include <afs/auth.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#endif
-#include <string.h>
+
 #include "ptserver.h"
 #include "pterror.h"
 #include "ptprototypes.h"

diff --git a/src/ptserver/pts.c b/src/ptserver/pts.c
index 20c9920..3e77f3a 100644 (file)
--- a/src/ptserver/pts.c
+++ b/src/ptserver/pts.c
@@ -12,31 +12,24 @@
 
 #include <roken.h>
 
-#include <stdio.h>
-#include <string.h>
-#ifdef AFS_AIX32_ENV
-#include <signal.h>
-#endif
 #include <ctype.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <afs/cmd.h>
+
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <WINNT/afsevent.h>
 #include <WINNT/afsreg.h>
-#else
-#include <netinet/in.h>
 #endif
+
 #include <afs/cellconfig.h>
+#include <afs/afsutil.h>
+#include <afs/com_err.h>
+#include <afs/cmd.h>
 #include <rx/rx.h>
 #include <rx/xdr.h>
+
 #include "ptclient.h"
 #include "ptuser.h"
 #include "pterror.h"
 #include "ptprototypes.h"
-#include <afs/afsutil.h>
-#include <afs/com_err.h>
 
 #undef FOREIGN
 

diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c
index 795f7b6..f4d8434 100644 (file)
--- a/src/ptserver/ptserver.c
+++ b/src/ptserver/ptserver.c
@@ -110,40 +110,30 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#ifdef AFS_AIX32_ENV
-#include <signal.h>
-#endif
-#include <sys/types.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <sys/stat.h>
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <WINNT/afsevent.h>
-#else
-#include <netdb.h>
-#include <netinet/in.h>
 #endif
-#include <string.h>
+
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <rx/rx_globals.h>
+#include <rx/rxstat.h>
 #include <lock.h>
 #include <ubik.h>
 #include <afs/cellconfig.h>
 #include <afs/auth.h>
 #include <afs/keys.h>
+#include <afs/afsutil.h>
+#include <afs/audit.h>
+#include <afs/com_err.h>
+
 #include "ptserver.h"
 #include "ptprototypes.h"
 #include "error_macros.h"
-#include "afs/audit.h"
-#include <afs/afsutil.h>
-#include <afs/com_err.h>
-#include <rx/rxstat.h>
 
 /* make        all of these into a structure if you want */
 struct prheader cheader;

diff --git a/src/ptserver/ptuser.c b/src/ptserver/ptuser.c
index 0ac9049..63e5730 100644 (file)
--- a/src/ptserver/ptuser.c
+++ b/src/ptserver/ptuser.c
@@ -9,26 +9,17 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#include <ctype.h>
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
-#include <stdio.h>
-#include <string.h>
 #include <rx/rx.h>
 #include <rx/xdr.h>
 #include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <afs/afsutil.h>
 #include <afs/com_err.h>
-#include <errno.h>
+
 #include "ptclient.h"
 #include "ptuser.h"
 #include "pterror.h"

diff --git a/src/ptserver/ptutils.c b/src/ptserver/ptutils.c
index 8313bc3..0c26cb4 100644 (file)
--- a/src/ptserver/ptutils.c
+++ b/src/ptserver/ptutils.c
@@ -22,27 +22,19 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#include <sys/types.h>
-#include <stdio.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
-#include <string.h>
 #include <lock.h>
 #include <ubik.h>
 #include <rx/xdr.h>
 #include <afs/com_err.h>
 #include <afs/cellconfig.h>
+
 #include "ptserver.h"
 #include "pterror.h"
 #include "ptprototypes.h"
-#include <stdlib.h>
 
 /* Foreign cells are represented by the group system:authuser@cell*/
 #define AUTHUSER_GROUP "system:authuser"

diff --git a/src/ptserver/readgroup.c b/src/ptserver/readgroup.c
index a56667f..456916b 100644 (file)
--- a/src/ptserver/readgroup.c
+++ b/src/ptserver/readgroup.c
@@ -12,17 +12,17 @@
 
 #include <roken.h>
 
-#include <stdio.h>
 #ifdef AFS_NT40_ENV
 #include <WINNT/afsevent.h>
 #endif
 #include <ctype.h>
-#include <string.h>
+
 #include <rx/rx.h>
 #include <rx/xdr.h>
 #include <afs/cellconfig.h>
 #include <afs/afsutil.h>
 #include <afs/com_err.h>
+
 #include "ptclient.h"
 #include "ptuser.h"
 #include "pterror.h"

diff --git a/src/ptserver/readpwd.c b/src/ptserver/readpwd.c
index 97e6316..51bd156 100644 (file)
--- a/src/ptserver/readpwd.c
+++ b/src/ptserver/readpwd.c
@@ -12,16 +12,16 @@
 
 #include <roken.h>
 
-#include <stdio.h>
 #ifdef AFS_NT40_ENV
 #include <WINNT/afsevent.h>
 #endif
-#include <string.h>
+
 #include <rx/rx.h>
 #include <rx/xdr.h>
 #include <afs/cellconfig.h>
 #include <afs/afsutil.h>
 #include <afs/com_err.h>
+
 #include "ptclient.h"
 #include "ptuser.h"
 #include "ptprototypes.h"

diff --git a/src/ptserver/testpt.c b/src/ptserver/testpt.c
index 5537300..1b28245 100644 (file)
--- a/src/ptserver/testpt.c
+++ b/src/ptserver/testpt.c
@@ -13,39 +13,25 @@
 #include <roken.h>
 
 #include <ctype.h>
-#include <errno.h>
-#include <sys/types.h>
+#include <math.h>
+
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <WINNT/afsevent.h>
-#else
-#include <sys/socket.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#endif
-#include <string.h>
-#include <math.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
 #endif
+
 #include <rx/rx.h>
 #include <rx/xdr.h>
 #include <afs/rxgen_consts.h>
 #include <afs/cmd.h>
 #include <afs/auth.h>
 #include <afs/cellconfig.h>
+#include <afs/afsutil.h>
+#include <afs/com_err.h>
+
 #include "ptclient.h"
 #include "pterror.h"
 #include "ptuser.h"
 #include "ptprototypes.h"
-#include <afs/afsutil.h>
-#include <afs/com_err.h>
 
 static char *whoami = "testpr";
 static struct afsconf_dir *conf;       /* cell info, set by MyBeforeProc */

diff --git a/src/ptserver/ubik.c b/src/ptserver/ubik.c
index 6b9b928..8022379 100644 (file)
--- a/src/ptserver/ubik.c
+++ b/src/ptserver/ubik.c
@@ -2,24 +2,16 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <io.h>
-#else
-#include <netinet/in.h>
-#endif
-#include <string.h>
-#include <stdarg.h>
-
 #include <lock.h>
-#define UBIK_INTERNALS
-#include <afs/stds.h>
 #include <afs/cellconfig.h>
+#define UBIK_INTERNALS
 #include <ubik.h>
 #include <rx/xdr.h>
+
 #include "ptint.h"
 #include "ptserver.h"
 

diff --git a/src/ptserver/utils.c b/src/ptserver/utils.c
index 75013a1..a73c178 100644 (file)
--- a/src/ptserver/utils.c
+++ b/src/ptserver/utils.c
@@ -12,17 +12,9 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
 #include <lock.h>
 #include <ubik.h>
-#include <stdio.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#include <netdb.h>
-#endif
-#include <string.h>
+
 #include "ptserver.h"
 #include "pterror.h"