reindent-20030715

[openafs.git] / src / rx / LINUX / rx_knet.c

diff --git a/src/rx/LINUX/rx_knet.c b/src/rx/LINUX/rx_knet.c
index efe9a40..148422b 100644 (file)
--- a/src/rx/LINUX/rx_knet.c
+++ b/src/rx/LINUX/rx_knet.c
@@ -15,7 +15,8 @@
 #include <afsconfig.h>
 #include "afs/param.h"
 
-RCSID("$Header$");
+RCSID
+    ("$Header$");
 
 #include <linux/version.h>
 #ifdef AFS_LINUX22_ENV
@@ -28,24 +29,26 @@ RCSID("$Header$");
 /* rxk_NewSocket
  * open and bind RX socket
  */
-struct osi_socket *rxk_NewSocket(short aport)
+struct osi_socket *
+rxk_NewSocket(short aport)
 {
     struct socket *sockp;
     struct sockaddr_in myaddr;
     int code;
 
-    
+
     code = sock_create(AF_INET, SOCK_DGRAM, IPPROTO_UDP, &sockp);
-    if (code<0)
+    if (code < 0)
        return NULL;
 
     /* Bind socket */
     myaddr.sin_family = AF_INET;
     myaddr.sin_addr.s_addr = htonl(INADDR_ANY);
     myaddr.sin_port = aport;
-    code = sockp->ops->bind(sockp, (struct sockaddr*)&myaddr, sizeof(myaddr));
+    code =
+       sockp->ops->bind(sockp, (struct sockaddr *)&myaddr, sizeof(myaddr));
 
-    if (code<0) {
+    if (code < 0) {
 #if defined(AFS_LINUX24_ENV)
        printk("sock_release(rx_socket) FIXME\n");
 #else
@@ -54,12 +57,13 @@ struct osi_socket *rxk_NewSocket(short aport)
        return NULL;
     }
 
-    return (struct osi_socket*)sockp;
+    return (struct osi_socket *)sockp;
 }
 
 
 /* free socket allocated by osi_NetSocket */
-int rxk_FreeSocket(register struct socket *asocket)
+int
+rxk_FreeSocket(register struct socket *asocket)
 {
     AFS_STATCNT(osi_FreeSocket);
     return 0;
@@ -72,24 +76,24 @@ int rxk_FreeSocket(register struct socket *asocket)
  * 0 = success
  * non-zero = failure
  */
-int osi_NetSend(osi_socket sop, struct sockaddr_in *to,
-               struct iovec *iov, int iovcnt, afs_int32 size, int istack)
+int
+osi_NetSend(osi_socket sop, struct sockaddr_in *to, struct iovec *iov,
+           int iovcnt, afs_int32 size, int istack)
 {
     KERNEL_SPACE_DECL;
     struct msghdr msg;
     int code;
-    struct iovec tmpvec[RX_MAXWVECS+2];
+    struct iovec tmpvec[RX_MAXWVECS + 2];
 
-    if (iovcnt > RX_MAXWVECS+2) {
+    if (iovcnt > RX_MAXWVECS + 2) {
        osi_Panic("Too many (%d) iovecs passed to osi_NetSend\n", iovcnt);
     }
 
-    if (iovcnt <= 2) { /* avoid pointless uiomove */
+    if (iovcnt <= 2) {         /* avoid pointless uiomove */
        tmpvec[0].iov_base = iov[0].iov_base;
        tmpvec[0].iov_len = size;
        msg.msg_iovlen = 1;
-    }
-    else {
+    } else {
        memcpy(tmpvec, iov, iovcnt * sizeof(struct iovec));
        msg.msg_iovlen = iovcnt;
     }
@@ -103,7 +107,7 @@ int osi_NetSend(osi_socket sop, struct sockaddr_in *to,
     TO_USER_SPACE();
     code = sock_sendmsg(sop, &msg, size);
     TO_KERNEL_SPACE();
-    return (code<0) ? code : 0;
+    return (code < 0) ? code : 0;
 }
 
 
@@ -128,16 +132,17 @@ int osi_NetSend(osi_socket sop, struct sockaddr_in *to,
  */
 int rxk_lastSocketError;
 int rxk_nSocketErrors;
-int osi_NetReceive(osi_socket so, struct sockaddr_in *from, 
-                  struct iovec *iov, int iovcnt, int *lengthp)
+int
+osi_NetReceive(osi_socket so, struct sockaddr_in *from, struct iovec *iov,
+              int iovcnt, int *lengthp)
 {
     KERNEL_SPACE_DECL;
     struct msghdr msg;
     int code;
-    struct iovec tmpvec[RX_MAXWVECS+2];
-    struct socket *sop = (struct socket*)so;
+    struct iovec tmpvec[RX_MAXWVECS + 2];
+    struct socket *sop = (struct socket *)so;
 
-    if (iovcnt > RX_MAXWVECS+2) {
+    if (iovcnt > RX_MAXWVECS + 2) {
        osi_Panic("Too many (%d) iovecs passed to osi_NetReceive\n", iovcnt);
     }
     memcpy(tmpvec, iov, iovcnt * sizeof(struct iovec));
@@ -152,20 +157,19 @@ int osi_NetReceive(osi_socket so, struct sockaddr_in *from,
     code = sock_recvmsg(sop, &msg, *lengthp, 0);
     TO_KERNEL_SPACE();
 
-    if (code<0) {
+    if (code < 0) {
        /* Clear the error before using the socket again.
         * Oh joy, Linux has hidden header files as well. It appears we can
         * simply call again and have it clear itself via sock_error().
         */
 #ifdef AFS_LINUX22_ENV
-       flush_signals(current); /* We don't want no stinkin' signals. */
+       flush_signals(current); /* We don't want no stinkin' signals. */
 #else
-       current->signal = 0; /* We don't want no stinkin' signals. */
+       current->signal = 0;    /* We don't want no stinkin' signals. */
 #endif
        rxk_lastSocketError = code;
-       rxk_nSocketErrors ++ ;
-    }
-    else {
+       rxk_nSocketErrors++;
+    } else {
        *lengthp = code;
        code = 0;
     }
@@ -173,7 +177,8 @@ int osi_NetReceive(osi_socket so, struct sockaddr_in *from,
     return code;
 }
 
-void osi_StopListener(void)
+void
+osi_StopListener(void)
 {
     struct task_struct *listener;
     extern int rxk_ListenerPid;
@@ -181,7 +186,7 @@ void osi_StopListener(void)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
     read_lock(&tasklist_lock);
 #endif
-    listener =  find_task_by_pid(rxk_ListenerPid);
+    listener = find_task_by_pid(rxk_ListenerPid);
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
     read_unlock(&tasklist_lock);
 #endif
@@ -190,7 +195,7 @@ void osi_StopListener(void)
 
        flush_signals(listener);
        force_sig(SIGKILL, listener);
-       afs_osi_Sleep(&rxk_ListenerPid); 
+       afs_osi_Sleep(&rxk_ListenerPid);
     }
     sock_release(rx_socket);
     rx_socket = NULL;