xnu-1504.9.17.tar.gz

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

diff --git a/bsd/netat/adsp_TimerElem.c b/bsd/netat/adsp_TimerElem.c
index 7950171507d0ac91f96c7bd57fb8534144d40b58..dd04ee2449ed78873cded9476de17211e3c015a2 100644 (file)
--- a/bsd/netat/adsp_TimerElem.c
+++ b/bsd/netat/adsp_TimerElem.c
@@ -1,31 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * @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 
- * compliance with the License.  The rights granted to you under the 
- * License may not be used to create, or enable the creation or 
- * redistribution of, 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, 
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * 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
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * 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,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * 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_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* 
  * TimerElem.c 
@@ -55,7 +53,7 @@
 #include <netat/adsp_internal.h>
 
 
-extern void DoTimerElem();     /* (TimerElemPtr t);  
+extern void DoTimerElem(TimerElemPtr); /* (TimerElemPtr t);  
                                 * External routine called to 
                                 * process each one. */
 
@@ -86,7 +84,7 @@ void InsertTimerElem(qhead, t, val)
     }
     p = (TimerElemPtr)qhead;
 
-    while (n = p->link) {
+    while ((n = p->link)) {
        if (val <= n->timer)    /* Do we go in front of this? */
        {
            n->timer -= val;    /* Yes, adjust his delta */
@@ -131,11 +129,11 @@ void RemoveTimerElem(qhead, t)    /* (TimerElemPtr *qhead, TimerElemPtr t) */
     }
     p = (TimerElemPtr)qhead;
 
-    while (n = p->link)        /* Get next item in queue */
+    while ((n = p->link))      /* Get next item in queue */
     {
        if (n == t)             /* Is it us? */
        {
-           if (p->link = n->link) /* Link our parent to our child */
+           if ((p->link = n->link)) /* Link our parent to our child */
            {
                n->link->timer += t->timer; /* and update child's timer */
            }