xnu-1228.15.4.tar.gz

[apple/xnu.git] / bsd / netat / adsp_Control.c

diff --git a/bsd/netat/adsp_Control.c b/bsd/netat/adsp_Control.c
index 3bc19f8467444f54c05c91a287263a21620b0c05..040683e0b5891bebb05b913bab3c53aaed3aa695 100644 (file)
--- a/bsd/netat/adsp_Control.c
+++ b/bsd/netat/adsp_Control.c
@@ -65,6 +65,8 @@
 
 int adsp_window = 1;
 
+int attachData(CCBPtr, gbuf_t *mp);
+
 /*
  * CalcRecvWdw
  *
@@ -81,7 +83,7 @@ int CalcRecvWdw(sp)           /* (CCBPtr sp) */
     bytes = calcRecvQ(sp);
     bytes = sp->rbuflen - bytes; /* get what is left */
 
-    if (bytes <= 16) {         /* %%% this should be zero */
+    if ((bytes <= 16)) {               /* %%% this should be zero */
        sp->rbufFull = 1;       /* Save flag that our recv buf is full */
        return 0;
     }
@@ -89,6 +91,7 @@ int CalcRecvWdw(sp)           /* (CCBPtr sp) */
        return ((bytes+bytes+bytes) >> 2) + 1; /* %%% */
 }
 
+int
 calcRecvQ(sp)
     CCBPtr sp;
 {
@@ -104,13 +107,13 @@ calcRecvQ(sp)
     register gbuf_t *mb;
 
     if (sp->rData) {           /* There is data in buffer */
-       if (mb = sp->rbuf_mb) {
+       if ((mb = sp->rbuf_mb)) {
            do {
                bytes += gbuf_msgsize(mb);
                mb = gbuf_next(mb);
            } while (mb);
        }
-       if (mb = sp->crbuf_mb)
+       if ((mb = sp->crbuf_mb))
            bytes += gbuf_msgsize(mb);
     }
 #endif
@@ -144,7 +147,7 @@ void CheckSend(sp)          /* (CCBPtr sp) */
     int use_attention_code;
     int len;                   /* length used in allocd mblk */
     int datalen;               /* amount of data attached to mblk */
-    gbuf_t *mprev, *mlist = 0;
+    gbuf_t *mprev = 0, *mlist = 0;
 
 top:
 
@@ -297,7 +300,7 @@ top:
                                            * in a row. */
     {
        attnMsg = 0;
-       if (datalen = attachData(sp, mp)) /* attach data to mp */
+       if ((datalen = attachData(sp, mp))) /* attach data to mp */
            goto sendit;        /* if successful, sendit */
     }
 
@@ -375,6 +378,8 @@ void completepb(sp, pb)
        gbuf_freem(pb->mp);
 }
 
+
+int
 attachData(sp, mp)
     register CCBPtr sp;
     register gbuf_t *mp;
@@ -404,9 +409,9 @@ attachData(sp, mp)
      */
     UAL_ASSIGN_HTON(sp->f.pktFirstByteSeq, sp->sendSeq);
                
-    if (smp = sp->sbuf_mb) /* Get oldest header */
+    if ((smp = sp->sbuf_mb)) /* Get oldest header */
        eom = 1;
-    else if (smp = sp->csbuf_mb)
+    else if ((smp = sp->csbuf_mb))
        eom = 0;
 
     if (smp == 0) {            /* this shouldn't happen... */