xnu-6153.61.1.tar.gz

[apple/xnu.git] / bsd / net / raw_cb.c

diff --git a/bsd/net/raw_cb.c b/bsd/net/raw_cb.c
index 2aaaeeb4b3074de6731c757cdd11915886e1c0e7..9fbbd01ce6da36178901054fe45b87862c5090e0 100644 (file)
--- a/bsd/net/raw_cb.c
+++ b/bsd/net/raw_cb.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2000-2012 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
+ *
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
- * 
+ *
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
+ *
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -22,7 +22,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- * 
+ *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
@@ -81,9 +81,9 @@
 
 struct rawcb_list_head rawcb_list;
 
-static uint32_t        raw_sendspace = RAWSNDQ;
-static uint32_t        raw_recvspace = RAWRCVQ;
-extern lck_mtx_t       *raw_mtx;       /*### global raw cb mutex for now */
+static uint32_t raw_sendspace = RAWSNDQ;
+static uint32_t raw_recvspace = RAWRCVQ;
+extern lck_mtx_t        *raw_mtx;       /*### global raw cb mutex for now */
 
 /*
  * Allocate a control block and a nominal amount
@@ -100,18 +100,20 @@ raw_attach(struct socket *so, int proto)
         * after space has been allocated for the
         * rawcb.
         */
-       if (rp == 0)
-               return (ENOBUFS);
+       if (rp == 0) {
+               return ENOBUFS;
+       }
        error = soreserve(so, raw_sendspace, raw_recvspace);
-       if (error)
-               return (error);
+       if (error) {
+               return error;
+       }
        rp->rcb_socket = so;
        rp->rcb_proto.sp_family = SOCK_DOM(so);
        rp->rcb_proto.sp_protocol = proto;
        lck_mtx_lock(raw_mtx);
        LIST_INSERT_HEAD(&rawcb_list, rp, list);
        lck_mtx_unlock(raw_mtx);
-       return (0);
+       return 0;
 }
 
 /*
@@ -134,12 +136,13 @@ raw_detach(struct rawcb *rp)
        LIST_REMOVE(rp, list);
        lck_mtx_unlock(raw_mtx);
 #ifdef notdef
-       if (rp->rcb_laddr)
+       if (rp->rcb_laddr) {
                m_freem(dtom(rp->rcb_laddr));
+       }
        rp->rcb_laddr = 0;
 #endif
        rp->rcb_socket = NULL;
-       FREE((caddr_t)(rp), M_PCB);
+       FREE(rp, M_PCB);
 }
 
 /*
@@ -151,8 +154,9 @@ raw_disconnect(struct rawcb *rp)
        struct socket *so = rp->rcb_socket;
 
 #ifdef notdef
-       if (rp->rcb_faddr)
+       if (rp->rcb_faddr) {
                m_freem(dtom(rp->rcb_faddr));
+       }
        rp->rcb_faddr = 0;
 #endif
        /*
@@ -160,8 +164,9 @@ raw_disconnect(struct rawcb *rp)
         * so check for SOF_MP_SUBFLOW socket flag before detaching the PCB;
         * when the socket is closed for real, SOF_MP_SUBFLOW would be cleared.
         */
-       if (!(so->so_flags & SOF_MP_SUBFLOW) && (so->so_state & SS_NOFDREF))
+       if (!(so->so_flags & SOF_MP_SUBFLOW) && (so->so_state & SS_NOFDREF)) {
                raw_detach(rp);
+       }
 }
 
 #ifdef notdef
@@ -173,13 +178,15 @@ raw_bind(struct socket *so, struct mbuf *nam)
        struct sockaddr *addr = mtod(nam, struct sockaddr *);
        struct rawcb *rp;
 
-       if (ifnet == 0)
-               return (EADDRNOTAVAIL);
+       if (ifnet == 0) {
+               return EADDRNOTAVAIL;
+       }
        rp = sotorawcb(so);
        nam = m_copym(nam, 0, M_COPYALL, M_WAITOK);
-       if (nam == NULL)
+       if (nam == NULL) {
                return ENOBUFS;
+       }
        rp->rcb_laddr = mtod(nam, struct sockaddr *);
-       return (0);
+       return 0;
 }
 #endif