jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-22 17:00:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rx: Tidy header includes

Browse Source 
Remove headers which are provided by libroken, and reorder header
includes so that they're a bit a more legible.

Change-Id: I7bb08d7ec7a75b485f7f619fd4d8179d4c7349f0
Reviewed-on: http://gerrit.openafs.org/4403
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
This commit is contained in:
Simon Wilkinson 2011-03-27 22:18:23 +01:00 committed by Jeffrey Altman
parent 24173064d9
commit a329e9a9d8
30 changed files with 29 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/rx/rx.c
View File

@ -10,7 +10,7 @@
/* RX: Extended Remote Procedure Call */
#include <afsconfig.h>
#include "afs/param.h"
#include <afs/param.h>
#ifdef KERNEL
# include "afs/sysincludes.h"
@ -63,26 +63,12 @@ extern afs_int32 afs_termState;
# include "afs/rxgen_consts.h"
#else /* KERNEL */
# include <roken.h>
# include <sys/types.h>
# include <string.h>
# include <stdarg.h>
# include <errno.h>
# ifdef HAVE_STDINT_H
# include <stdint.h>
# endif
# ifdef AFS_NT40_ENV
# include <stdlib.h>
# include <fcntl.h>
# include <afs/afsutil.h>
# include <WINNT\afsreg.h>
# else
# include <sys/socket.h>
# include <sys/file.h>
# include <netdb.h>
# include <sys/stat.h>
# include <netinet/in.h>
# include <sys/time.h>
# endif
# include "rx_user.h"
#endif /* KERNEL */

10
src/rx/rx_clock.c
View File

@ -11,7 +11,7 @@
/* See rx_clock.h for calling conventions */
#include <afsconfig.h>
#include "afs/param.h"
#include <afs/param.h>
#ifdef AFS_SUN59_ENV
#include <sys/time_impl.h>
@ -26,13 +26,7 @@
# include "afsincludes.h"
# endif /* !UKERNEL */
#else /* KERNEL */
# include <sys/time.h>
# ifdef HAVE_SIGNAL_H
# include <signal.h>
# endif
# include <stdio.h>
# include <errno.h>
# include <stdlib.h>
# include <roken.h>
#endif
#include "rx.h"

3
src/rx/rx_clock_nt.c
View File

@ -13,10 +13,9 @@
#include <afsconfig.h>
#include <afs/param.h>
#include <roken.h>
#ifdef AFS_NT40_ENV
#include <stdio.h>
#include <stdlib.h>
#include <windef.h>
#include <winbase.h>
#include "rx_clock.h"

6
src/rx/rx_conncache.c
View File

@ -14,12 +14,8 @@
#include <afsconfig.h>
#include <afs/param.h>
#ifndef KERNEL
# include <roken.h>
#endif /* KERNEL */
#include <roken.h>
#include <sys/types.h>
#include <errno.h>
#include "rx.h"
/*

6
src/rx/rx_event.c
View File

@ -8,7 +8,7 @@
*/
#include <afsconfig.h>
#include "afs/param.h"
#include <afs/param.h>
#ifdef AFS_SUN59_ENV
# include <sys/time_impl.h>
@ -41,16 +41,12 @@ extern void *osi_Alloc();
# endif
#else /* KERNEL */
# include <roken.h>
# include <stdio.h>
# include "rx_user.h"
# ifdef AFS_PTHREAD_ENV
# include "rx_pthread.h"
# else
# include "rx_lwp.h"
# endif
# ifdef AFS_NT40_ENV
# include <malloc.h>
# endif
#endif /* KERNEL */
#include "rx.h"

11
src/rx/rx_getaddr.c
View File

@ -10,16 +10,11 @@
#include <afsconfig.h>
#include <afs/param.h>
#ifndef KERNEL
# include <roken.h>
# ifndef AFS_NT40_ENV
# include <sys/types.h>
# include <sys/socket.h>
# include <sys/time.h>
# include <net/if.h>
# include <netinet/in.h>
# include <sys/ioctl.h>
# include <string.h>
# include <net/if.h>
# if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
# include <sys/sysctl.h>
# ifndef AFS_ARM_DARWIN_ENV

2
src/rx/rx_globals.c
View File

@ -19,7 +19,7 @@
#endif
#include <afsconfig.h>
#include "afs/param.h"
#include <afs/param.h>
/* Enable data initialization when the header file is included */
#define GLOBALSINIT(stuff) = stuff

2
src/rx/rx_identity.c
View File

@ -27,8 +27,6 @@
#ifndef KERNEL
# include <roken.h>
# include <sys/types.h>
# include <string.h>
#else
# include "afs/sysincludes.h"
# include "afsincludes.h"

2
src/rx/rx_kcommon.c
View File

@ -12,7 +12,7 @@
*/
#include <afsconfig.h>
#include "afs/param.h"
#include <afs/param.h>
#include "rx/rx_kcommon.h"

26
src/rx/rx_lwp.c
View File

@ -21,36 +21,14 @@
#include <afsconfig.h>
#include <afs/param.h>
#ifndef KERNEL
# include <roken.h>
#endif /* KERNEL */
#include <roken.h>
#include <sys/types.h> /* fd_set on older platforms */
#include <errno.h>
#include <signal.h>
#ifdef AFS_NT40_ENV
# include <winsock2.h>
#else
# include <unistd.h> /* select() prototype */
# include <sys/time.h> /* struct timeval, select() prototype */
# ifndef FD_SET
# include <sys/select.h> /* fd_set on newer platforms */
# endif
# include <sys/socket.h>
# include <sys/file.h>
# include <netdb.h>
# include <sys/stat.h>
# include <netinet/in.h>
# include <net/if.h>
# include <sys/ioctl.h>
# include <sys/time.h>
#endif
#include <lwp.h>
#include "rx.h"
#include "rx_atomic.h"
#include "rx_globals.h"
#include "rx_stats.h"
#include <lwp.h>
#define MAXTHREADNAMELENGTH 64

12
src/rx/rx_misc.c
View File

@ -15,23 +15,11 @@
# include <afsincludes.h>
#else
# include <roken.h>
# ifdef AFS_NT40_ENV
# include <winsock2.h>
# include <malloc.h>
# else
# include <sys/param.h>
# endif
# include <errno.h>
# include <afs/errors.h>
# include "xdr.h"
# ifdef AFS_PTHREAD_ENV
# include "rx.h"
# endif /* AFS_PTHREAD_ENV */
# include <stdlib.h>
# include <string.h>
# ifdef HAVE_UNISTD_H
# include <unistd.h>
# endif
# ifdef AFS_NT40_ENV
# ifndef EDQUOT
# define EDQUOT WSAEDQUOT

2
src/rx/rx_multi.c
View File

@ -11,7 +11,7 @@
#include <afs/param.h>
#ifdef KERNEL
#include "afs/sysincludes.h"
# include "afs/sysincludes.h"
#else /* KERNEL */
# include <roken.h>
#endif /* KERNEL */

2
src/rx/rx_null.c
View File

@ -8,7 +8,7 @@
*/
#include <afsconfig.h>
#include "afs/param.h"
#include <afs/param.h>
#ifdef KERNEL
# ifndef UKERNEL

3
src/rx/rx_opaque.c
View File

@ -27,9 +27,6 @@
#ifndef KERNEL
# include <roken.h>
# include <sys/types.h>
# include <string.h>
# include <errno.h>
#else
# include "afs/sysincludes.h"
# include "afsincludes.h"

12
src/rx/rx_packet.c
View File

@ -42,25 +42,13 @@
# endif /* defined(UKERNEL) */
#else /* KERNEL */
# include <roken.h>
# include <sys/types.h>
# include <sys/stat.h>
# include <errno.h>
# include <stdlib.h>
# include <assert.h>
# include <string.h>
# ifdef HAVE_UNISTD_H
# include <unistd.h>
# endif
# if defined(AFS_NT40_ENV)
# include <winsock2.h>
# ifndef EWOULDBLOCK
# define EWOULDBLOCK WSAEWOULDBLOCK
# endif
# include "rx_user.h"
# include "rx_xmit_nt.h"
# else
# include <sys/socket.h>
# include <netinet/in.h>
# endif
# include <lwp.h>
#endif /* KERNEL */

24
src/rx/rx_pthread.c
View File

@ -18,29 +18,9 @@
#include <afsconfig.h>
#include <afs/param.h>
#ifndef KERNEL
# include <roken.h>
#endif /* KERNEL */
#include <roken.h>
#include <sys/types.h>
#include <errno.h>
#include <signal.h>
#include <string.h>
#ifdef HAVE_STDINT_H
# include <stdint.h>
#endif
#ifndef AFS_NT40_ENV
# include <sys/socket.h>
# include <sys/file.h>
# include <netdb.h>
# include <netinet/in.h>
# include <net/if.h>
# include <sys/ioctl.h>
# include <sys/time.h>
# include <unistd.h>
# include <assert.h>
#endif
#include <sys/stat.h>
#include <assert.h>
#include "rx.h"
#include "rx_globals.h"

13
src/rx/rx_rdwr.c
View File

@ -53,19 +53,6 @@
# include "afs/lock.h"
#else /* KERNEL */
# include <roken.h>
# include <sys/types.h>
# include <string.h>
# ifdef AFS_NT40_ENV
# include <winsock2.h>
# else /* !AFS_NT40_ENV */
# include <sys/socket.h>
# include <sys/file.h>
# include <netdb.h>
# include <netinet/in.h>
# include <sys/stat.h>
# include <sys/time.h>
# include <unistd.h>
# endif /* !AFS_NT40_ENV */
#endif /* KERNEL */
#include "rx.h"

1
src/rx/rx_stats.c
View File

@ -33,7 +33,6 @@
#if !defined(KERNEL)
#include <roken.h>
#include <string.h>
#endif
#ifdef KERNEL

12
src/rx/rx_trace.c
View File

@ -10,9 +10,7 @@
#include <afsconfig.h>
#include <afs/param.h>
#ifndef KERNEL
# include <roken.h>
#endif /* KERNEL */
#include <roken.h>
#ifndef RXDEBUG
char rxi_tracename[80] = "\0Tracing not compiled in";
@ -24,14 +22,6 @@ main(int argc, char **argv)
}
#endif
#else
#include <string.h>
#ifdef AFS_NT40_ENV
#include <fcntl.h>
#include <io.h>
#else
#include <sys/file.h>
#include <unistd.h>
#endif
#include "rx.h"
#include "rx_atomic.h"

21
src/rx/rx_user.c
View File

@ -14,28 +14,13 @@
#include <afsconfig.h>
#include <afs/param.h>
#ifndef KERNEL
# include <roken.h>
#endif /* KERNEL */
#include <roken.h>
#include <sys/types.h>
#include <errno.h>
#include <signal.h>
#include <string.h>
#ifdef AFS_NT40_ENV
# include <WINNT/syscfg.h>
#else
# include <sys/socket.h>
# include <sys/file.h>
# include <netdb.h>
# include <sys/stat.h>
# include <netinet/in.h>
# include <sys/time.h>
# include <net/if.h>
# include <sys/ioctl.h>
# include <unistd.h>
#endif
#include <fcntl.h>
#if !defined(AFS_AIX_ENV) && !defined(AFS_NT40_ENV)
# include <sys/syscall.h>
#endif
@ -57,10 +42,6 @@
#endif
#endif
#ifndef AFS_NT40_ENV
# include <sys/time.h>
#endif
#include "rx.h"
#include "rx_atomic.h"
#include "rx_globals.h"

3
src/rx/xdr.c
View File

@ -32,7 +32,6 @@
#ifndef KERNEL
# include <roken.h>
# include <string.h>
#endif
@ -53,8 +52,6 @@
#ifndef AFS_LINUX20_ENV
#include <sys/systm.h>
#endif
#else
#include <stdio.h>
#endif
#include "xdr.h"
#include "rx.h"

9
src/rx/xdr_afsuuid.c
View File

@ -12,21 +12,16 @@
*/
#include <afsconfig.h>
#include "afs/param.h"
#include <afs/param.h>
#if defined(KERNEL) && !defined(UKERNEL)
#ifdef AFS_LINUX20_ENV
#include "h/string.h"
#if 0
#define bzero(A, C) memset((A), 0, (C))
#endif
#else
#include <sys/param.h>
#include <sys/systm.h>
#endif
#else
#include <stdio.h>
#include <roken.h>
#endif
#include "xdr.h"

6
src/rx/xdr_array.c
View File

@ -51,17 +51,11 @@
#include <sys/param.h>
#ifdef AFS_LINUX20_ENV
#include "h/string.h"
#if 0
#define bzero(A,C) memset((A), 0, (C))
#endif
#else
#ifndef AFS_DARWIN90_ENV
#include <sys/systm.h>
#endif
#endif /* AFS_LINUX20_ENV */
#else
#include <stdio.h>
#include <string.h>
#endif
#include "xdr.h"

6
src/rx/xdr_arrayn.c
View File

@ -51,15 +51,11 @@
#include <sys/param.h>
#ifdef AFS_LINUX20_ENV
#include "h/string.h"
#if 0
#define bzero(A,C) memset((A), 0, (C))
#endif
#else
#include <sys/systm.h>
#endif
#else
#include <stdio.h>
#include <string.h>
#include <roken.h>
#endif
#include "xdr.h"

6
src/rx/xdr_int32.c
View File

@ -28,11 +28,7 @@
*/
#include <afsconfig.h>
#ifdef KERNEL
#include "afs/param.h"
#else
#include <afs/param.h>
#endif
#ifndef NeXT
@ -40,7 +36,7 @@
#if defined(KERNEL) && !defined(UKERNEL)
#include <sys/param.h>
#else
#include <stdio.h>
#include <roken.h>
#endif
#include "xdr.h"

2
src/rx/xdr_int64.c
View File

@ -15,7 +15,7 @@
#include <sys/systm.h>
#endif
#else
#include <stdio.h>
#include <roken.h>
#endif
#include "xdr.h"

2
src/rx/xdr_len.c
View File

@ -28,7 +28,7 @@
#ifdef KERNEL
# include "afs/sysincludes.h"
#else
# include <stdlib.h>
# include <roken.h>
#endif
#include "xdr.h"

5
src/rx/xdr_mem.c
View File

@ -43,11 +43,8 @@
#ifdef KERNEL
# include "afs/sysincludes.h"
#else
# include <string.h>
# include <roken.h>
# include <limits.h>
# ifndef AFS_NT40_ENV
# include <netinet/in.h>
# endif
#endif
#include "xdr.h"

13
src/rx/xdr_rec.c
View File

@ -46,19 +46,8 @@
#include <afsconfig.h>
#include <afs/param.h>
#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
#include <roken.h>
#include "xdr.h"
#ifndef AFS_NT40_ENV
#include <sys/time.h>
#include <netinet/in.h>
#endif
#include <string.h>
/* * A record is composed of one or more record fragments.
* A record fragment is a two-byte header followed by zero to

5
src/rx/xdr_rx.c
View File

@ -34,11 +34,6 @@
# endif /* !UKERNEL */
#else /* KERNEL */
# include <roken.h>
# include <sys/types.h>
# include <stdio.h>
# ifndef AFS_NT40_ENV
# include <netinet/in.h>
# endif
#endif /* KERNEL */
#include "rx.h"