From be4e9d973c2717872663010c9c02f8bc75cb18a5 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Sat, 14 Nov 2009 18:56:43 +0000 Subject: Reindent include directory, reformatting prototypes as necessary. Exclude include/gssrpc due to its Sun origin and k5-platform.h due to macros too hairy for emacs c-mode to handle. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23180 dc483132-0cff-0310-8789-dd5450dbe970 --- src/include/port-sockets.h | 127 +++++++++++++++++++++++---------------------- 1 file changed, 64 insertions(+), 63 deletions(-) (limited to 'src/include/port-sockets.h') diff --git a/src/include/port-sockets.h b/src/include/port-sockets.h index 35ed2b4c42..bb2b5173f9 100644 --- a/src/include/port-sockets.h +++ b/src/include/port-sockets.h @@ -1,3 +1,4 @@ +/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ #ifndef _PORT_SOCKET_H #define _PORT_SOCKET_H #if defined(_WIN32) @@ -10,14 +11,14 @@ typedef WSABUF sg_buf; -#define SG_ADVANCE(SG, N) \ - ((SG)->len < (N) \ - ? (abort(), 0) \ - : ((SG)->buf += (N), (SG)->len -= (N), 0)) +#define SG_ADVANCE(SG, N) \ + ((SG)->len < (N) \ + ? (abort(), 0) \ + : ((SG)->buf += (N), (SG)->len -= (N), 0)) -#define SG_LEN(SG) ((SG)->len + 0) -#define SG_BUF(SG) ((SG)->buf + 0) -#define SG_SET(SG, B, N) ((SG)->buf = (char *)(B),(SG)->len = (N)) +#define SG_LEN(SG) ((SG)->len + 0) +#define SG_BUF(SG) ((SG)->buf + 0) +#define SG_SET(SG, B, N) ((SG)->buf = (char *)(B),(SG)->len = (N)) #define SOCKET_INITIALIZE() 0 #define SOCKET_CLEANUP() @@ -26,9 +27,9 @@ typedef WSABUF sg_buf; #define SOCKET_NFDS(f) (0) /* select()'s first arg is ignored */ #define SOCKET_READ(fd, b, l) (recv(fd, b, l, 0)) #define SOCKET_WRITE(fd, b, l) (send(fd, b, l, 0)) -#define SOCKET_CONNECT connect /* XXX */ -#define SOCKET_GETSOCKNAME getsockname /* XXX */ -#define SOCKET_CLOSE close /* XXX */ +#define SOCKET_CONNECT connect /* XXX */ +#define SOCKET_GETSOCKNAME getsockname /* XXX */ +#define SOCKET_CLOSE close /* XXX */ #define SOCKET_EINTR WSAEINTR /* Return -1 for error or number of bytes written. @@ -36,12 +37,12 @@ typedef WSABUF sg_buf; must be used by this macro (to avoid compiler warnings). */ /* WSASend returns 0 or SOCKET_ERROR. */ #define SOCKET_WRITEV_TEMP DWORD -#define SOCKET_WRITEV(FD, SG, LEN, TMP) \ - (WSASend((FD), (SG), (LEN), &(TMP), 0, 0, 0) ? -1 : (TMP)) +#define SOCKET_WRITEV(FD, SG, LEN, TMP) \ + (WSASend((FD), (SG), (LEN), &(TMP), 0, 0, 0) ? -1 : (TMP)) -#define SHUTDOWN_READ SD_RECEIVE -#define SHUTDOWN_WRITE SD_SEND -#define SHUTDOWN_BOTH SD_BOTH +#define SHUTDOWN_READ SD_RECEIVE +#define SHUTDOWN_WRITE SD_SEND +#define SHUTDOWN_BOTH SD_BOTH #ifndef EINPROGRESS #define EINPROGRESS WSAEINPROGRESS @@ -79,23 +80,23 @@ typedef int socklen_t; #include "autoconf.h" #include -#include /* For struct sockaddr_in and in_addr */ -#include /* For inet_ntoa */ +#include /* For struct sockaddr_in and in_addr */ +#include /* For inet_ntoa */ #include #ifndef HAVE_NETDB_H_H_ERRNO -extern int h_errno; /* In case it's missing, e.g., HP-UX 10.20. */ +extern int h_errno; /* In case it's missing, e.g., HP-UX 10.20. */ #endif -#include /* For MAXHOSTNAMELEN */ -#include /* For SOCK_*, AF_*, etc */ -#include /* For struct timeval */ -#include /* For struct ifconf, for localaddr.c */ +#include /* For MAXHOSTNAMELEN */ +#include /* For SOCK_*, AF_*, etc */ +#include /* For struct timeval */ +#include /* For struct ifconf, for localaddr.c */ #ifdef HAVE_SYS_UIO_H -#include /* For struct iovec, for sg_buf */ +#include /* For struct iovec, for sg_buf */ #endif #ifdef HAVE_SYS_FILIO_H -#include /* For FIONBIO on Solaris. */ +#include /* For FIONBIO on Solaris. */ #endif /* Either size_t or int or unsigned int is probably right. Under @@ -118,59 +119,59 @@ struct krb5int_sockaddr_storage { /* * Compatability with WinSock calls on MS-Windows... */ -#define SOCKET int -#define INVALID_SOCKET ((SOCKET)~0) -#define closesocket close -#define ioctlsocket ioctl -#define SOCKET_ERROR (-1) +#define SOCKET int +#define INVALID_SOCKET ((SOCKET)~0) +#define closesocket close +#define ioctlsocket ioctl +#define SOCKET_ERROR (-1) typedef struct iovec sg_buf; -#define SG_ADVANCE(SG, N) \ - ((SG)->iov_len < (N) \ - ? (abort(), 0) \ - : ((SG)->iov_base = (char *) (SG)->iov_base + (N), \ - (SG)->iov_len -= (N), 0)) +#define SG_ADVANCE(SG, N) \ + ((SG)->iov_len < (N) \ + ? (abort(), 0) \ + : ((SG)->iov_base = (char *) (SG)->iov_base + (N), \ + (SG)->iov_len -= (N), 0)) -#define SG_LEN(SG) ((SG)->iov_len + 0) -#define SG_BUF(SG) ((char*)(SG)->iov_base + 0) -#define SG_SET(SG, B, L) ((SG)->iov_base = (char*)(B), (SG)->iov_len = (L)) +#define SG_LEN(SG) ((SG)->iov_len + 0) +#define SG_BUF(SG) ((char*)(SG)->iov_base + 0) +#define SG_SET(SG, B, L) ((SG)->iov_base = (char*)(B), (SG)->iov_len = (L)) /* Some of our own infrastructure where the WinSock stuff was too hairy to dump into a clean Unix program... */ -#define SOCKET_INITIALIZE() (0) /* No error (or anything else) */ -#define SOCKET_CLEANUP() /* nothing */ -#define SOCKET_ERRNO errno -#define SOCKET_SET_ERRNO(x) (errno = (x)) -#define SOCKET_NFDS(f) ((f)+1) /* select() arg for a single fd */ -#define SOCKET_READ read -#define SOCKET_WRITE write -#define SOCKET_CONNECT connect -#define SOCKET_GETSOCKNAME getsockname -#define SOCKET_CLOSE close -#define SOCKET_EINTR EINTR +#define SOCKET_INITIALIZE() (0) /* No error (or anything else) */ +#define SOCKET_CLEANUP() /* nothing */ +#define SOCKET_ERRNO errno +#define SOCKET_SET_ERRNO(x) (errno = (x)) +#define SOCKET_NFDS(f) ((f)+1) /* select() arg for a single fd */ +#define SOCKET_READ read +#define SOCKET_WRITE write +#define SOCKET_CONNECT connect +#define SOCKET_GETSOCKNAME getsockname +#define SOCKET_CLOSE close +#define SOCKET_EINTR EINTR #define SOCKET_WRITEV_TEMP int /* Use TMP to avoid compiler warnings and keep things consistent with Windoze version. */ -#define SOCKET_WRITEV(FD, SG, LEN, TMP) \ - ((TMP) = writev((FD), (SG), (LEN)), (TMP)) +#define SOCKET_WRITEV(FD, SG, LEN, TMP) \ + ((TMP) = writev((FD), (SG), (LEN)), (TMP)) -#define SHUTDOWN_READ 0 -#define SHUTDOWN_WRITE 1 -#define SHUTDOWN_BOTH 2 +#define SHUTDOWN_READ 0 +#define SHUTDOWN_WRITE 1 +#define SHUTDOWN_BOTH 2 #ifndef HAVE_INET_NTOP -#define inet_ntop(AF,SRC,DST,CNT) \ - ((AF) == AF_INET \ - ? ((CNT) < 16 \ - ? (SOCKET_SET_ERRNO(ENOSPC), (const char *)NULL) \ - : (sprintf((DST), "%d.%d.%d.%d", \ - ((const unsigned char *)(const void *)(SRC))[0] & 0xff, \ - ((const unsigned char *)(const void *)(SRC))[1] & 0xff, \ - ((const unsigned char *)(const void *)(SRC))[2] & 0xff, \ - ((const unsigned char *)(const void *)(SRC))[3] & 0xff), \ - (DST))) \ +#define inet_ntop(AF,SRC,DST,CNT) \ + ((AF) == AF_INET \ + ? ((CNT) < 16 \ + ? (SOCKET_SET_ERRNO(ENOSPC), (const char *)NULL) \ + : (sprintf((DST), "%d.%d.%d.%d", \ + ((const unsigned char *)(const void *)(SRC))[0] & 0xff, \ + ((const unsigned char *)(const void *)(SRC))[1] & 0xff, \ + ((const unsigned char *)(const void *)(SRC))[2] & 0xff, \ + ((const unsigned char *)(const void *)(SRC))[3] & 0xff), \ + (DST))) \ : (SOCKET_SET_ERRNO(EAFNOSUPPORT), (const char *)NULL)) #define HAVE_INET_NTOP #endif -- cgit