From: Andrew Deason Date: Fri, 21 Dec 2012 11:11:00 +0000 (+0000) Subject: ihandle: Indent ifdef maze X-Git-Tag: openafs-stable-1_8_0pre1~1699 X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=a04071e7940b26dc2a29ac3f0952b10321e7b786 ihandle: Indent ifdef maze According to the mesoamerican long count calendar, ifdef ladders will destroy the world in 2012. Change-Id: Ie9b16d600e4743eba3d934f8c3cf4d299abbf7e3 Reviewed-on: http://gerrit.openafs.org/8837 Reviewed-by: Chas Williams - CONTRACTOR Tested-by: BuildBot Reviewed-by: Derrick Brashear --- diff --git a/src/vol/ihandle.h b/src/vol/ihandle.h index 7c36877..9e48d09 100644 --- a/src/vol/ihandle.h +++ b/src/vol/ihandle.h @@ -71,25 +71,25 @@ #define _IHANDLE_H_ #ifdef AFS_PTHREAD_ENV -#include +# include extern pthread_once_t ih_glock_once; extern pthread_mutex_t ih_glock_mutex; extern void ih_glock_init(void); -#define IH_LOCK \ +# define IH_LOCK \ do { opr_Verify(pthread_once(&ih_glock_once, ih_glock_init) == 0); \ opr_mutex_enter(&ih_glock_mutex); \ } while (0) -#define IH_UNLOCK opr_mutex_exit(&ih_glock_mutex) +# define IH_UNLOCK opr_mutex_exit(&ih_glock_mutex) #else /* AFS_PTHREAD_ENV */ -#define IH_LOCK -#define IH_UNLOCK +# define IH_LOCK +# define IH_UNLOCK #endif /* AFS_PTHREAD_ENV */ #ifndef DLL_INIT_LIST /* * Macro to initialize a doubly linked list, lifted from Encina */ -#define DLL_INIT_LIST(head, tail) \ +# define DLL_INIT_LIST(head, tail) \ do { \ (head) = NULL; \ (tail) = NULL; \ @@ -98,7 +98,7 @@ extern void ih_glock_init(void); /* * Macro to remove an element from a doubly linked list */ -#define DLL_DELETE(ptr,head,tail,next,prev) \ +# define DLL_DELETE(ptr,head,tail,next,prev) \ do { \ if ((ptr)->next) \ (ptr)->next->prev = (ptr)->prev; \ @@ -115,7 +115,7 @@ extern void ih_glock_init(void); /* * Macro to insert an element at the tail of a doubly linked list */ -#define DLL_INSERT_TAIL(ptr,head,tail,next,prev) \ +# define DLL_INSERT_TAIL(ptr,head,tail,next,prev) \ do { \ (ptr)->next = NULL; \ (ptr)->prev = (tail); \ @@ -132,7 +132,7 @@ extern void ih_glock_init(void); #ifdef AFS_NT40_ENV typedef __int64 Inode; #else -#include +# include #endif /* The dir package's page hashing function is dependent upon the layout of @@ -149,10 +149,10 @@ struct IHandle_s; */ #ifdef AFS_NT40_ENV typedef HANDLE FD_t; -#define INVALID_FD INVALID_HANDLE_VALUE +# define INVALID_FD INVALID_HANDLE_VALUE #else typedef int FD_t; -#define INVALID_FD ((FD_t)-1) +# define INVALID_FD ((FD_t)-1) #endif /* file descriptor handle */ @@ -283,10 +283,10 @@ typedef struct IHashBucket_s { /* Prototypes for handle support routines. */ #ifdef AFS_NAMEI_ENV -#ifdef AFS_NT40_ENV -#include "ntops.h" -#endif -#include "namei_ops.h" +# ifdef AFS_NT40_ENV +# include "ntops.h" +# endif +# include "namei_ops.h" extern void ih_clear(IHandle_t * h); extern Inode ih_create(IHandle_t * h, int dev, char *part, Inode nI, int p1, @@ -362,59 +362,58 @@ extern int ih_condsync(IHandle_t * ihP); #define IH_CONDSYNC(H) ih_condsync(H) #ifdef HAVE_PIO -#ifdef AFS_NT40_ENV -#define OS_PREAD(FD, B, S, O) nt_pread(FD, B, S, O) -#define OS_PWRITE(FD, B, S, O) nt_pwrite(FD, B, S, O) -#else -#ifdef O_LARGEFILE -#define OS_PREAD(FD, B, S, O) pread64(FD, B, S, O) -#define OS_PWRITE(FD, B, S, O) pwrite64(FD, B, S, O) -#else /* !O_LARGEFILE */ -#define OS_PREAD(FD, B, S, O) pread(FD, B, S, O) -#define OS_PWRITE(FD, B, S, O) pwrite(FD, B, S, O) -#endif /* !O_LARGEFILE */ -#endif /* AFS_NT40_ENV */ +# ifdef AFS_NT40_ENV +# define OS_PREAD(FD, B, S, O) nt_pread(FD, B, S, O) +# define OS_PWRITE(FD, B, S, O) nt_pwrite(FD, B, S, O) +# else +# ifdef O_LARGEFILE +# define OS_PREAD(FD, B, S, O) pread64(FD, B, S, O) +# define OS_PWRITE(FD, B, S, O) pwrite64(FD, B, S, O) +# else /* !O_LARGEFILE */ +# define OS_PREAD(FD, B, S, O) pread(FD, B, S, O) +# define OS_PWRITE(FD, B, S, O) pwrite(FD, B, S, O) +# endif /* !O_LARGEFILE */ +# endif /* AFS_NT40_ENV */ #else /* !HAVE_PIO */ extern ssize_t ih_pread(FD_t fd, void * buf, size_t count, afs_foff_t offset); extern ssize_t ih_pwrite(FD_t fd, const void * buf, size_t count, afs_foff_t offset); -#define OS_PREAD(FD, B, S, O) ih_pread(FD, B, S, O) -#define OS_PWRITE(FD, B, S, O) ih_pwrite(FD, B, S, O) +# define OS_PREAD(FD, B, S, O) ih_pread(FD, B, S, O) +# define OS_PWRITE(FD, B, S, O) ih_pwrite(FD, B, S, O) #endif /* !HAVE_PIO */ + #ifdef AFS_NT40_ENV -#define OS_LOCKFILE(FD, O) (!LockFile(FD, (DWORD)((O) & 0xFFFFFFFF), (DWORD)((O) >> 32), 2, 0)) -#define OS_UNLOCKFILE(FD, O) (!UnlockFile(FD, (DWORD)((O) & 0xFFFFFFFF), (DWORD)((O) >> 32), 2, 0)) -#define OS_ERROR(X) nterr_nt2unix(GetLastError(), X) -#define OS_UNLINK(X) nt_unlink(X) -#define OS_DIRSEP "\\" -#define OS_DIRSEPC '\\' +# define OS_LOCKFILE(FD, O) (!LockFile(FD, (DWORD)((O) & 0xFFFFFFFF), (DWORD)((O) >> 32), 2, 0)) +# define OS_UNLOCKFILE(FD, O) (!UnlockFile(FD, (DWORD)((O) & 0xFFFFFFFF), (DWORD)((O) >> 32), 2, 0)) +# define OS_ERROR(X) nterr_nt2unix(GetLastError(), X) +# define OS_UNLINK(X) nt_unlink(X) +# define OS_DIRSEP "\\" +# define OS_DIRSEPC '\\' #else -#define OS_LOCKFILE(FD, O) flock(FD, LOCK_EX) -#define OS_UNLOCKFILE(FD, O) flock(FD, LOCK_UN) -#define OS_ERROR(X) X -#define OS_UNLINK(X) unlink(X) -#define OS_DIRSEP "/" -#define OS_DIRSEPC '/' +# define OS_LOCKFILE(FD, O) flock(FD, LOCK_EX) +# define OS_UNLOCKFILE(FD, O) flock(FD, LOCK_UN) +# define OS_ERROR(X) X +# define OS_UNLINK(X) unlink(X) +# define OS_DIRSEP "/" +# define OS_DIRSEPC '/' #endif - - #ifdef AFS_NAMEI_ENV -#ifdef AFS_NT40_ENV -#define OS_OPEN(F, M, P) nt_open(F, M, P) -#define OS_CLOSE(FD) nt_close(FD) +# ifdef AFS_NT40_ENV +# define OS_OPEN(F, M, P) nt_open(F, M, P) +# define OS_CLOSE(FD) nt_close(FD) -#define OS_READ(FD, B, S) nt_read(FD, B, S) -#define OS_WRITE(FD, B, S) nt_write(FD, B, S) -#define OS_SEEK(FD, O, F) nt_seek(FD, O, F) +# define OS_READ(FD, B, S) nt_read(FD, B, S) +# define OS_WRITE(FD, B, S) nt_write(FD, B, S) +# define OS_SEEK(FD, O, F) nt_seek(FD, O, F) -#define OS_SYNC(FD) nt_fsync(FD) -#define OS_TRUNC(FD, L) nt_ftruncate(FD, L) +# define OS_SYNC(FD) nt_fsync(FD) +# define OS_TRUNC(FD, L) nt_ftruncate(FD, L) -#else /* AFS_NT40_ENV */ +# else /* AFS_NT40_ENV */ /*@+fcnmacros +macrofcndecl@*/ -#ifdef S_SPLINT_S +# ifdef S_SPLINT_S extern Inode IH_CREATE(IHandle_t * H, int /*@alt Device @ */ D, char *P, Inode N, int /*@alt VolumeId @ */ P1, int /*@alt VnodeId @ */ P2, @@ -435,109 +434,109 @@ extern afs_sfsize_t IH_IREAD(IHandle_t * H, afs_foff_t O, void *B, afs_fsize_t S); extern afs_sfsize_t IH_IWRITE(IHandle_t * H, afs_foff_t O, void *B, afs_fsize_t S); -#ifdef O_LARGEFILE -#define OFFT off64_t -#else -#define OFFT off_t -#endif +# ifdef O_LARGEFILE +# define OFFT off64_t +# else +# define OFFT off_t +# endif extern OFFT OS_SEEK(FD_t FD, OFFT O, int F); extern int OS_TRUNC(FD_t FD, OFFT L); -#endif /*S_SPLINT_S */ - -#ifdef O_LARGEFILE -#define OS_OPEN(F, M, P) open64(F, M, P) -#else /* !O_LARGEFILE */ -#define OS_OPEN(F, M, P) open(F, M, P) -#endif /* !O_LARGEFILE */ -#define OS_CLOSE(FD) close(FD) - -#define OS_READ(FD, B, S) read(FD, B, S) -#define OS_WRITE(FD, B, S) write(FD, B, S) -#ifdef O_LARGEFILE -#define OS_SEEK(FD, O, F) lseek64(FD, (off64_t) (O), F) -#define OS_TRUNC(FD, L) ftruncate64(FD, (off64_t) (L)) -#else /* !O_LARGEFILE */ -#define OS_SEEK(FD, O, F) lseek(FD, (off_t) (O), F) -#define OS_TRUNC(FD, L) ftruncate(FD, (off_t) (L)) -#endif /* !O_LARGEFILE */ - -#define OS_SYNC(FD) fsync(FD) +# endif /*S_SPLINT_S */ + +# ifdef O_LARGEFILE +# define OS_OPEN(F, M, P) open64(F, M, P) +# else /* !O_LARGEFILE */ +# define OS_OPEN(F, M, P) open(F, M, P) +# endif /* !O_LARGEFILE */ +# define OS_CLOSE(FD) close(FD) + +# define OS_READ(FD, B, S) read(FD, B, S) +# define OS_WRITE(FD, B, S) write(FD, B, S) +# ifdef O_LARGEFILE +# define OS_SEEK(FD, O, F) lseek64(FD, (off64_t) (O), F) +# define OS_TRUNC(FD, L) ftruncate64(FD, (off64_t) (L)) +# else /* !O_LARGEFILE */ +# define OS_SEEK(FD, O, F) lseek(FD, (off_t) (O), F) +# define OS_TRUNC(FD, L) ftruncate(FD, (off_t) (L)) +# endif /* !O_LARGEFILE */ + +# define OS_SYNC(FD) fsync(FD) /*@=fcnmacros =macrofcndecl@*/ -#endif /* AFS_NT40_ENV */ -#define IH_INC(H, I, P) namei_inc(H, I, P) -#define IH_DEC(H, I, P) namei_dec(H, I, P) -#define IH_IREAD(H, O, B, S) namei_iread(H, O, B, S) -#define IH_IWRITE(H, O, B, S) namei_iwrite(H, O, B, S) -#define IH_CREATE(H, D, P, N, P1, P2, P3, P4) \ - namei_icreate(H, P, P1, P2, P3, P4) -#define OS_IOPEN(H) namei_iopen(H) +# endif /* AFS_NT40_ENV */ +# define IH_INC(H, I, P) namei_inc(H, I, P) +# define IH_DEC(H, I, P) namei_dec(H, I, P) +# define IH_IREAD(H, O, B, S) namei_iread(H, O, B, S) +# define IH_IWRITE(H, O, B, S) namei_iwrite(H, O, B, S) +# define IH_CREATE(H, D, P, N, P1, P2, P3, P4) \ + namei_icreate(H, P, P1, P2, P3, P4) +# define OS_IOPEN(H) namei_iopen(H) #else /* AFS_NAMEI_ENV */ extern Inode ih_icreate(IHandle_t * ih, int dev, char *part, Inode nI, int p1, int p2, int p3, int p4); -#define IH_CREATE(H, D, P, N, P1, P2, P3, P4) \ - ih_icreate(H, D, P, N, P1, P2, P3, P4) - -#ifdef AFS_LINUX22_ENV -#define OS_IOPEN(H) -1 -#else -#ifdef O_LARGEFILE -#define OS_IOPEN(H) (IOPEN((H)->ih_dev, (H)->ih_ino, O_RDWR|O_LARGEFILE)) -#else -#define OS_IOPEN(H) (IOPEN((H)->ih_dev, (H)->ih_ino, O_RDWR)) -#endif -#endif -#define OS_OPEN(F, M, P) open(F, M, P) -#define OS_CLOSE(FD) close(FD) - -#define OS_READ(FD, B, S) read(FD, B, S) -#define OS_WRITE(FD, B, S) write(FD, B, S) -#ifdef O_LARGEFILE -#define OS_SEEK(FD, O, F) lseek64(FD, (off64_t) (O), F) -#define OS_TRUNC(FD, L) ftruncate64(FD, (off64_t) (L)) -#else /* !O_LARGEFILE */ -#define OS_SEEK(FD, O, F) lseek(FD, (off_t) (O), F) -#define OS_TRUNC(FD, L) ftruncate(FD, (off_t) (L)) -#endif /* !O_LARGEFILE */ - -#define OS_SYNC(FD) fsync(FD) - -#ifdef AFS_LINUX22_ENV -#define IH_INC(H, I, P) -1 -#define IH_DEC(H, I, P) -1 -#define IH_IREAD(H, O, B, S) -1 -#define IH_IWRITE(H, O, B, S) -1 -#else -#define IH_INC(H, I, P) IINC((H)->ih_dev, I, P) -#define IH_DEC(H, I, P) IDEC((H)->ih_dev, I, P) -#define IH_IREAD(H, O, B, S) inode_read((H)->ih_dev, (H)->ih_ino, (H)->ih_vid,\ - O, B, S) -#define IH_IWRITE(H, O, B, S) \ - inode_write((H)->ih_dev, (H)->ih_ino, (H)->ih_vid, O, B, S) -#endif /* AFS_LINUX22_ENV */ +# define IH_CREATE(H, D, P, N, P1, P2, P3, P4) \ + ih_icreate(H, D, P, N, P1, P2, P3, P4) +# ifdef AFS_LINUX22_ENV +# define OS_IOPEN(H) -1 +# else +# ifdef O_LARGEFILE +# define OS_IOPEN(H) (IOPEN((H)->ih_dev, (H)->ih_ino, O_RDWR|O_LARGEFILE)) +# else +# define OS_IOPEN(H) (IOPEN((H)->ih_dev, (H)->ih_ino, O_RDWR)) +# endif +# endif +# define OS_OPEN(F, M, P) open(F, M, P) +# define OS_CLOSE(FD) close(FD) + +# define OS_READ(FD, B, S) read(FD, B, S) +# define OS_WRITE(FD, B, S) write(FD, B, S) +# ifdef O_LARGEFILE +# define OS_SEEK(FD, O, F) lseek64(FD, (off64_t) (O), F) +# define OS_TRUNC(FD, L) ftruncate64(FD, (off64_t) (L)) +# else /* !O_LARGEFILE */ +# define OS_SEEK(FD, O, F) lseek(FD, (off_t) (O), F) +# define OS_TRUNC(FD, L) ftruncate(FD, (off_t) (L)) +# endif /* !O_LARGEFILE */ + +# define OS_SYNC(FD) fsync(FD) + +# ifdef AFS_LINUX22_ENV +# define IH_INC(H, I, P) -1 +# define IH_DEC(H, I, P) -1 +# define IH_IREAD(H, O, B, S) -1 +# define IH_IWRITE(H, O, B, S) -1 +# else +# define IH_INC(H, I, P) IINC((H)->ih_dev, I, P) +# define IH_DEC(H, I, P) IDEC((H)->ih_dev, I, P) +# define IH_IREAD(H, O, B, S) inode_read((H)->ih_dev, (H)->ih_ino, (H)->ih_vid,\ + O, B, S) +# define IH_IWRITE(H, O, B, S) \ + inode_write((H)->ih_dev, (H)->ih_ino, (H)->ih_vid, O, B, S) +# endif /* AFS_LINUX22_ENV */ #endif /* AFS_NAMEI_ENV */ + #define OS_SIZE(FD) ih_size(FD) extern afs_sfsize_t ih_size(FD_t); #ifndef AFS_NT40_ENV -#define FDH_READV(H, I, N) readv((H)->fd_fd, I, N) -#define FDH_WRITEV(H, I, N) writev((H)->fd_fd, I, N) +# define FDH_READV(H, I, N) readv((H)->fd_fd, I, N) +# define FDH_WRITEV(H, I, N) writev((H)->fd_fd, I, N) #endif #ifdef HAVE_PIOV -#ifdef O_LARGEFILE -#define FDH_PREADV(H, I, N, O) preadv64((H)->fd_fd, I, N, O) -#define FDH_PWRITEV(H, I, N, O) pwritev64((H)->fd_fd, I, N, O) -#else /* !O_LARGEFILE */ -#define FDH_PREADV(H, I, N, O) preadv((H)->fd_fd, I, N, O) -#define FDH_PWRITEV(H, I, N, O) pwritev((H)->fd_fd, I, N, O) -#endif /* !O_LARGEFILE */ +# ifdef O_LARGEFILE +# define FDH_PREADV(H, I, N, O) preadv64((H)->fd_fd, I, N, O) +# define FDH_PWRITEV(H, I, N, O) pwritev64((H)->fd_fd, I, N, O) +# else /* !O_LARGEFILE */ +# define FDH_PREADV(H, I, N, O) preadv((H)->fd_fd, I, N, O) +# define FDH_PWRITEV(H, I, N, O) pwritev((H)->fd_fd, I, N, O) +# endif /* !O_LARGEFILE */ #endif #define FDH_PREAD(H, B, S, O) OS_PREAD((H)->fd_fd, B, S, O) @@ -553,54 +552,54 @@ extern afs_sfsize_t ih_size(FD_t); #define FDH_UNLOCKFILE(H, O) OS_UNLOCKFILE((H)->fd_fd, O) #ifdef AFS_NT40_ENV -#define afs_stat_st __stat64 -#define afs_stat _stat64 -#define afs_fstat _fstat64 -#define afs_fopen fopen -#define afs_open open -#define afs_lseek(FD, O, F) _lseeki64(FD, O, F) -#else -#ifdef O_LARGEFILE -#define afs_stat_st stat64 -#define afs_stat stat64 -#define afs_fstat fstat64 -#define afs_fopen fopen64 -#define afs_open open64 -#ifdef S_SPLINT_S +# define afs_stat_st __stat64 +# define afs_stat _stat64 +# define afs_fstat _fstat64 +# define afs_fopen fopen +# define afs_open open +# define afs_lseek(FD, O, F) _lseeki64(FD, O, F) +#else /* AFS_NT40_ENV */ +# ifdef O_LARGEFILE +# define afs_stat_st stat64 +# define afs_stat stat64 +# define afs_fstat fstat64 +# define afs_fopen fopen64 +# define afs_open open64 +# ifdef S_SPLINT_S extern off64_t afs_lseek(int FD, off64_t O, int F); -#endif /*S_SPLINT_S */ -#define afs_lseek(FD, O, F) lseek64(FD, (off64_t) (O), F) -#define afs_ftruncate ftruncate64 -#define afs_mmap mmap64 -#ifdef AFS_AIX_ENV +# endif /*S_SPLINT_S */ +# define afs_lseek(FD, O, F) lseek64(FD, (off64_t) (O), F) +# define afs_ftruncate ftruncate64 +# define afs_mmap mmap64 +# ifdef AFS_AIX_ENV extern void * mmap64(); /* ugly hack since aix build env appears to be somewhat broken */ -#endif -#else /* !O_LARGEFILE */ -#define afs_stat_st stat -#define afs_stat stat -#define afs_fstat fstat -#define afs_fopen fopen -#define afs_open open -#ifdef S_SPLINT_S +# endif +# else /* !O_LARGEFILE */ +# define afs_stat_st stat +# define afs_stat stat +# define afs_fstat fstat +# define afs_fopen fopen +# define afs_open open +# ifdef S_SPLINT_S extern off_t afs_lseek(int FD, off_t O, int F); -#endif /*S_SPLINT_S */ -#define afs_lseek(FD, O, F) lseek(FD, (off_t) (O), F) -#define afs_ftruncate ftruncate -#define afs_mmap mmap -#endif /* !O_LARGEFILE */ -#if AFS_HAVE_STATVFS64 -# define afs_statvfs statvfs64 -#else -# if AFS_HAVE_STATFS64 -# define afs_statfs statfs64 -#else -# if AFS_HAVE_STATVFS -# define afs_statvfs statvfs +# endif /*S_SPLINT_S */ +# define afs_lseek(FD, O, F) lseek(FD, (off_t) (O), F) +# define afs_ftruncate ftruncate +# define afs_mmap mmap +# endif /* !O_LARGEFILE */ +# if AFS_HAVE_STATVFS64 +# define afs_statvfs statvfs64 +# else +# if AFS_HAVE_STATFS64 +# define afs_statfs statfs64 # else -# define afs_statfs statfs -# endif /* !AFS_HAVE_STATVFS */ -# endif /* !AFS_HAVE_STATFS64 */ -#endif /* !AFS_HAVE_STATVFS64 */ -#endif /* AFS_NT40_ENV */ +# if AFS_HAVE_STATVFS +# define afs_statvfs statvfs +# else +# define afs_statfs statfs +# endif /* !AFS_HAVE_STATVFS */ +# endif /* !AFS_HAVE_STATFS64 */ +# endif /* !AFS_HAVE_STATVFS64 */ +#endif /* !AFS_NT40_ENV */ #endif /* _IHANDLE_H_ */