Since I have my hands all over netatalk adding locking and restructuring

it, cinch the file's style closer to style(9) with regard to parenthesis:

  s/( /(/g
  s/ )/)/g
  s/return(/return (/g
  s/return 0/return (0)/
  s/return 1/return (1)/

1 files changed, 96 insertions, 96 deletions

diff --git a/sys/netatalk/ddp_pcb.c b/sys/netatalk/ddp_pcb.c
index 900c9c8..4ee48d5 100644
--- a/sys/netatalk/ddp_pcb.c
+++ b/sys/netatalk/ddp_pcb.c
@@ -38,41 +38,41 @@ at_pcbsetaddr(struct ddpcb *ddp, struct sockaddr *addr, struct thread *td)
     struct at_ifaddr	*aa;
     struct ddpcb	*ddpp;
 
-    if ( ddp->ddp_lsat.sat_port != ATADDR_ANYPORT ) { /* shouldn't be bound */
-	return( EINVAL );
+    if (ddp->ddp_lsat.sat_port != ATADDR_ANYPORT) { /* shouldn't be bound */
+	return (EINVAL);
     }
 
     if (addr != NULL) {			/* validate passed address */
 	sat = (struct sockaddr_at *)addr;
 	if (sat->sat_family != AF_APPLETALK) {
-	    return(EAFNOSUPPORT);
+	    return (EAFNOSUPPORT);
 	}
 
-	if ( sat->sat_addr.s_node != ATADDR_ANYNODE ||
-		sat->sat_addr.s_net != ATADDR_ANYNET ) {
-	    for ( aa = at_ifaddr; aa; aa = aa->aa_next ) {
-		if (( sat->sat_addr.s_net == AA_SAT( aa )->sat_addr.s_net ) &&
-		 ( sat->sat_addr.s_node == AA_SAT( aa )->sat_addr.s_node )) {
+	if (sat->sat_addr.s_node != ATADDR_ANYNODE ||
+		sat->sat_addr.s_net != ATADDR_ANYNET) {
+	    for (aa = at_ifaddr; aa; aa = aa->aa_next) {
+		if ((sat->sat_addr.s_net == AA_SAT(aa)->sat_addr.s_net) &&
+		 (sat->sat_addr.s_node == AA_SAT(aa)->sat_addr.s_node)) {
 		    break;
 		}
 	    }
-	    if ( !aa ) {
-		return( EADDRNOTAVAIL );
+	    if (!aa) {
+		return (EADDRNOTAVAIL);
 	    }
 	}
 
-	if ( sat->sat_port != ATADDR_ANYPORT ) {
-	    if ( sat->sat_port < ATPORT_FIRST ||
-		    sat->sat_port >= ATPORT_LAST ) {
-		return( EINVAL );
+	if (sat->sat_port != ATADDR_ANYPORT) {
+	    if (sat->sat_port < ATPORT_FIRST ||
+		    sat->sat_port >= ATPORT_LAST) {
+		return (EINVAL);
 	    }
-	    if ( sat->sat_port < ATPORT_RESERVED &&
-		 suser(td) ) {
-		return( EACCES );
+	    if (sat->sat_port < ATPORT_RESERVED &&
+		 suser(td)) {
+		return (EACCES);
 	    }
 	}
     } else {
-	bzero( (caddr_t)&lsat, sizeof( struct sockaddr_at ));
+	bzero((caddr_t)&lsat, sizeof(struct sockaddr_at));
 	lsat.sat_len = sizeof(struct sockaddr_at);
 	lsat.sat_addr.s_node = ATADDR_ANYNODE;
 	lsat.sat_addr.s_net = ATADDR_ANYNET;
@@ -80,49 +80,49 @@ at_pcbsetaddr(struct ddpcb *ddp, struct sockaddr *addr, struct thread *td)
 	sat = &lsat;
     }
 
-    if ( sat->sat_addr.s_node == ATADDR_ANYNODE &&
-	    sat->sat_addr.s_net == ATADDR_ANYNET ) {
-	if ( at_ifaddr == NULL ) {
-	    return( EADDRNOTAVAIL );
+    if (sat->sat_addr.s_node == ATADDR_ANYNODE &&
+	    sat->sat_addr.s_net == ATADDR_ANYNET) {
+	if (at_ifaddr == NULL) {
+	    return (EADDRNOTAVAIL);
 	}
-	sat->sat_addr = AA_SAT( at_ifaddr )->sat_addr;
+	sat->sat_addr = AA_SAT(at_ifaddr)->sat_addr;
     }
     ddp->ddp_lsat = *sat;
 
     /*
      * Choose port.
      */
-    if ( sat->sat_port == ATADDR_ANYPORT ) {
-	for ( sat->sat_port = ATPORT_RESERVED;
-		sat->sat_port < ATPORT_LAST; sat->sat_port++ ) {
-	    if ( ddp_ports[ sat->sat_port - 1 ] == NULL ) {
+    if (sat->sat_port == ATADDR_ANYPORT) {
+	for (sat->sat_port = ATPORT_RESERVED;
+		sat->sat_port < ATPORT_LAST; sat->sat_port++) {
+	    if (ddp_ports[ sat->sat_port - 1 ] == NULL) {
 		break;
 	    }
 	}
-	if ( sat->sat_port == ATPORT_LAST ) {
-	    return( EADDRNOTAVAIL );
+	if (sat->sat_port == ATPORT_LAST) {
+	    return (EADDRNOTAVAIL);
 	}
 	ddp->ddp_lsat.sat_port = sat->sat_port;
 	ddp_ports[ sat->sat_port - 1 ] = ddp;
     } else {
-	for ( ddpp = ddp_ports[ sat->sat_port - 1 ]; ddpp;
-		ddpp = ddpp->ddp_pnext ) {
-	    if ( ddpp->ddp_lsat.sat_addr.s_net == sat->sat_addr.s_net &&
-		    ddpp->ddp_lsat.sat_addr.s_node == sat->sat_addr.s_node ) {
+	for (ddpp = ddp_ports[ sat->sat_port - 1 ]; ddpp;
+		ddpp = ddpp->ddp_pnext) {
+	    if (ddpp->ddp_lsat.sat_addr.s_net == sat->sat_addr.s_net &&
+		    ddpp->ddp_lsat.sat_addr.s_node == sat->sat_addr.s_node) {
 		break;
 	    }
 	}
-	if ( ddpp != NULL ) {
-	    return( EADDRINUSE );
+	if (ddpp != NULL) {
+	    return (EADDRINUSE);
 	}
 	ddp->ddp_pnext = ddp_ports[ sat->sat_port - 1 ];
 	ddp_ports[ sat->sat_port - 1 ] = ddp;
-	if ( ddp->ddp_pnext ) {
+	if (ddp->ddp_pnext) {
 	    ddp->ddp_pnext->ddp_pprev = ddp;
 	}
     }
 
-    return( 0 );
+    return (0);
 }
 
 int
@@ -135,7 +135,7 @@ at_pcbconnect(struct ddpcb *ddp, struct sockaddr *addr, struct thread *td)
     u_short		hintnet = 0, net;
 
     if (sat->sat_family != AF_APPLETALK) {
-	return(EAFNOSUPPORT);
+	return (EAFNOSUPPORT);
     }
 
     /*
@@ -143,10 +143,10 @@ at_pcbconnect(struct ddpcb *ddp, struct sockaddr *addr, struct thread *td)
      * network" to mean the network the control block is bound to.
      * If the control block is not bound, there is an error.
      */
-    if ( sat->sat_addr.s_net == ATADDR_ANYNET
-		&& sat->sat_addr.s_node != ATADDR_ANYNODE ) {
-	if ( ddp->ddp_lsat.sat_port == ATADDR_ANYPORT ) {
-	    return( EADDRNOTAVAIL );
+    if (sat->sat_addr.s_net == ATADDR_ANYNET
+		&& sat->sat_addr.s_node != ATADDR_ANYNODE) {
+	if (ddp->ddp_lsat.sat_port == ATADDR_ANYPORT) {
+	    return (EADDRNOTAVAIL);
 	}
 	hintnet = ddp->ddp_lsat.sat_addr.s_net;
     }
@@ -157,27 +157,27 @@ at_pcbconnect(struct ddpcb *ddp, struct sockaddr *addr, struct thread *td)
      * If we've changed our address, we may have an old "good looking"
      * route here.  Attempt to detect it.
      */
-    if ( ro->ro_rt ) {
-	if ( hintnet ) {
+    if (ro->ro_rt) {
+	if (hintnet) {
 	    net = hintnet;
 	} else {
 	    net = sat->sat_addr.s_net;
 	}
 	aa = NULL;
 	if ((ifp = ro->ro_rt->rt_ifp) != NULL) {
-	    for ( aa = at_ifaddr; aa; aa = aa->aa_next ) {
-		if ( aa->aa_ifp == ifp &&
-			ntohs( net ) >= ntohs( aa->aa_firstnet ) &&
-			ntohs( net ) <= ntohs( aa->aa_lastnet )) {
+	    for (aa = at_ifaddr; aa; aa = aa->aa_next) {
+		if (aa->aa_ifp == ifp &&
+			ntohs(net) >= ntohs(aa->aa_firstnet) &&
+			ntohs(net) <= ntohs(aa->aa_lastnet)) {
 		    break;
 		}
 	    }
 	}
-	if ( aa == NULL || ( satosat( &ro->ro_dst )->sat_addr.s_net !=
-		( hintnet ? hintnet : sat->sat_addr.s_net ) ||
-		satosat( &ro->ro_dst )->sat_addr.s_node !=
-		sat->sat_addr.s_node )) {
-	    RTFREE( ro->ro_rt );
+	if (aa == NULL || (satosat(&ro->ro_dst)->sat_addr.s_net !=
+		(hintnet ? hintnet : sat->sat_addr.s_net) ||
+		satosat(&ro->ro_dst)->sat_addr.s_node !=
+		sat->sat_addr.s_node)) {
+	    RTFREE(ro->ro_rt);
 	    ro->ro_rt = NULL;
 	}
     }
@@ -185,42 +185,42 @@ at_pcbconnect(struct ddpcb *ddp, struct sockaddr *addr, struct thread *td)
     /*
      * If we've got no route for this interface, try to find one.
      */
-    if ( ro->ro_rt == NULL || ro->ro_rt->rt_ifp == NULL ) {
-	ro->ro_dst.sa_len = sizeof( struct sockaddr_at );
+    if (ro->ro_rt == NULL || ro->ro_rt->rt_ifp == NULL) {
+	ro->ro_dst.sa_len = sizeof(struct sockaddr_at);
 	ro->ro_dst.sa_family = AF_APPLETALK;
-	if ( hintnet ) {
-	    satosat( &ro->ro_dst )->sat_addr.s_net = hintnet;
+	if (hintnet) {
+	    satosat(&ro->ro_dst)->sat_addr.s_net = hintnet;
 	} else {
-	    satosat( &ro->ro_dst )->sat_addr.s_net = sat->sat_addr.s_net;
+	    satosat(&ro->ro_dst)->sat_addr.s_net = sat->sat_addr.s_net;
 	}
-	satosat( &ro->ro_dst )->sat_addr.s_node = sat->sat_addr.s_node;
-	rtalloc( ro );
+	satosat(&ro->ro_dst)->sat_addr.s_node = sat->sat_addr.s_node;
+	rtalloc(ro);
     }
 
     /*
      * Make sure any route that we have has a valid interface.
      */
     aa = NULL;
-    if ( ro->ro_rt && ( ifp = ro->ro_rt->rt_ifp )) {
-	for ( aa = at_ifaddr; aa; aa = aa->aa_next ) {
-	    if ( aa->aa_ifp == ifp ) {
+    if (ro->ro_rt && (ifp = ro->ro_rt->rt_ifp)) {
+	for (aa = at_ifaddr; aa; aa = aa->aa_next) {
+	    if (aa->aa_ifp == ifp) {
 		break;
 	    }
 	}
     }
-    if ( aa == NULL ) {
-	return( ENETUNREACH );
+    if (aa == NULL) {
+	return (ENETUNREACH);
     }
 
     ddp->ddp_fsat = *sat;
-    if ( ddp->ddp_lsat.sat_port == ATADDR_ANYPORT ) {
-	return(at_pcbsetaddr(ddp, NULL, td));
+    if (ddp->ddp_lsat.sat_port == ATADDR_ANYPORT) {
+	return (at_pcbsetaddr(ddp, NULL, td));
     }
-    return( 0 );
+    return (0);
 }
 
 void 
-at_pcbdisconnect( struct ddpcb	*ddp )
+at_pcbdisconnect(struct ddpcb	*ddp)
 {
     ddp->ddp_fsat.sat_addr.s_net = ATADDR_ANYNET;
     ddp->ddp_fsat.sat_addr.s_node = ATADDR_ANYNODE;
@@ -228,7 +228,7 @@ at_pcbdisconnect( struct ddpcb	*ddp )
 }
 
 int
-at_pcballoc( struct socket *so )
+at_pcballoc(struct socket *so)
 {
 	struct ddpcb	*ddp;
 
@@ -246,39 +246,39 @@ at_pcballoc( struct socket *so )
 
 	ddp->ddp_socket = so;
 	so->so_pcb = (caddr_t)ddp;
-	return(0);
+	return (0);
 }
 
 void
-at_pcbdetach( struct socket *so, struct ddpcb *ddp)
+at_pcbdetach(struct socket *so, struct ddpcb *ddp)
 {
-    soisdisconnected( so );
+    soisdisconnected(so);
     so->so_pcb = NULL;
     sotryfree(so);
 
     /* remove ddp from ddp_ports list */
-    if ( ddp->ddp_lsat.sat_port != ATADDR_ANYPORT &&
-	    ddp_ports[ ddp->ddp_lsat.sat_port - 1 ] != NULL ) {
-	if ( ddp->ddp_pprev != NULL ) {
+    if (ddp->ddp_lsat.sat_port != ATADDR_ANYPORT &&
+	    ddp_ports[ ddp->ddp_lsat.sat_port - 1 ] != NULL) {
+	if (ddp->ddp_pprev != NULL) {
 	    ddp->ddp_pprev->ddp_pnext = ddp->ddp_pnext;
 	} else {
 	    ddp_ports[ ddp->ddp_lsat.sat_port - 1 ] = ddp->ddp_pnext;
 	}
-	if ( ddp->ddp_pnext != NULL ) {
+	if (ddp->ddp_pnext != NULL) {
 	    ddp->ddp_pnext->ddp_pprev = ddp->ddp_pprev;
 	}
     }
 
-    if ( ddp->ddp_route.ro_rt ) {
-	RTFREE( ddp->ddp_route.ro_rt );
+    if (ddp->ddp_route.ro_rt) {
+	RTFREE(ddp->ddp_route.ro_rt);
     }
 
-    if ( ddp->ddp_prev ) {
+    if (ddp->ddp_prev) {
 	ddp->ddp_prev->ddp_next = ddp->ddp_next;
     } else {
 	ddpcb = ddp->ddp_next;
     }
-    if ( ddp->ddp_next ) {
+    if (ddp->ddp_next) {
 	ddp->ddp_next->ddp_prev = ddp->ddp_prev;
     }
     FREE(ddp, M_PCB);
@@ -291,7 +291,7 @@ at_pcbdetach( struct socket *so, struct ddpcb *ddp)
  * sockets (pcbs).
  */
 struct ddpcb *
-ddp_search( struct sockaddr_at *from, struct sockaddr_at *to,
+ddp_search(struct sockaddr_at *from, struct sockaddr_at *to,
 			struct at_ifaddr *aa)
 {
     struct ddpcb	*ddp;
@@ -299,39 +299,39 @@ ddp_search( struct sockaddr_at *from, struct sockaddr_at *to,
     /*
      * Check for bad ports.
      */
-    if ( to->sat_port < ATPORT_FIRST || to->sat_port >= ATPORT_LAST ) {
-	return( NULL );
+    if (to->sat_port < ATPORT_FIRST || to->sat_port >= ATPORT_LAST) {
+	return (NULL);
     }
 
     /*
      * Make sure the local address matches the sent address.  What about
      * the interface?
      */
-    for ( ddp = ddp_ports[ to->sat_port - 1 ]; ddp; ddp = ddp->ddp_pnext ) {
+    for (ddp = ddp_ports[ to->sat_port - 1 ]; ddp; ddp = ddp->ddp_pnext) {
 	/* XXX should we handle 0.YY? */
 
 	/* XXXX.YY to socket on destination interface */
-	if ( to->sat_addr.s_net == ddp->ddp_lsat.sat_addr.s_net &&
-		to->sat_addr.s_node == ddp->ddp_lsat.sat_addr.s_node ) {
+	if (to->sat_addr.s_net == ddp->ddp_lsat.sat_addr.s_net &&
+		to->sat_addr.s_node == ddp->ddp_lsat.sat_addr.s_node) {
 	    break;
 	}
 
 	/* 0.255 to socket on receiving interface */
-	if ( to->sat_addr.s_node == ATADDR_BCAST && ( to->sat_addr.s_net == 0 ||
-		to->sat_addr.s_net == ddp->ddp_lsat.sat_addr.s_net ) &&
-		ddp->ddp_lsat.sat_addr.s_net == AA_SAT( aa )->sat_addr.s_net ) {
+	if (to->sat_addr.s_node == ATADDR_BCAST && (to->sat_addr.s_net == 0 ||
+		to->sat_addr.s_net == ddp->ddp_lsat.sat_addr.s_net) &&
+		ddp->ddp_lsat.sat_addr.s_net == AA_SAT(aa)->sat_addr.s_net) {
 	    break;
 	}
 
 	/* XXXX.0 to socket on destination interface */
-	if ( to->sat_addr.s_net == aa->aa_firstnet &&
+	if (to->sat_addr.s_net == aa->aa_firstnet &&
 		to->sat_addr.s_node == 0 &&
-		ntohs( ddp->ddp_lsat.sat_addr.s_net ) >=
-		ntohs( aa->aa_firstnet ) &&
-		ntohs( ddp->ddp_lsat.sat_addr.s_net ) <=
-		ntohs( aa->aa_lastnet )) {
+		ntohs(ddp->ddp_lsat.sat_addr.s_net) >=
+		ntohs(aa->aa_firstnet) &&
+		ntohs(ddp->ddp_lsat.sat_addr.s_net) <=
+		ntohs(aa->aa_lastnet)) {
 	    break;
 	}
     }
-    return( ddp );
+    return (ddp);
 }