dlq-moveb-also-returns-void-20031212

[openafs.git] / src / bucoord / dlq.c

diff --git a/src/bucoord/dlq.c b/src/bucoord/dlq.c
index 30e77a6..cc7c999 100644 (file)
--- a/src/bucoord/dlq.c
+++ b/src/bucoord/dlq.c
@@ -13,7 +13,8 @@
 #include <stdlib.h>
 #endif
 
-RCSID("$Header$");
+RCSID
+    ("$Header$");
 
 #include <afs/bubasics.h>
 
@@ -33,30 +34,30 @@ RCSID("$Header$");
  */
 
 dlqEmpty(headptr)
-     dlqlinkP  headptr;
+     dlqlinkP headptr;
 {
     DLQ_ASSERT_HEAD(headptr);
-    if ( headptr->dlq_next == headptr )
-       return(1);
-    return(0);
+    if (headptr->dlq_next == headptr)
+       return (1);
+    return (0);
 }
 
 dlqInit(headptr)
-     dlqlinkP  headptr;
+     dlqlinkP headptr;
 {
     headptr->dlq_next = headptr;
     headptr->dlq_prev = headptr;
     headptr->dlq_type = DLQ_HEAD;
     headptr->dlq_structPtr = NULL;
-    return(0);
+    return (0);
 }
 
 /* dlqLinkf
  *     link item to front of chain
  */
 dlqLinkf(headptr, entryptr)
-     dlqlinkP  headptr;
-     dlqlinkP  entryptr;
+     dlqlinkP headptr;
+     dlqlinkP entryptr;
 {
     DLQ_ASSERT_HEAD(headptr);
     /* link in as first item in chain */
@@ -64,16 +65,16 @@ dlqLinkf(headptr, entryptr)
     headptr->dlq_next->dlq_prev = entryptr;
     entryptr->dlq_prev = headptr;
     headptr->dlq_next = entryptr;
-    return(0);
-}      
+    return (0);
+}
 
 /* dlqLinkb
  *     link item to end of chain
  */
 
 dlqLinkb(headptr, entryptr)
-     dlqlinkP  headptr;
-     dlqlinkP  entryptr;
+     dlqlinkP headptr;
+     dlqlinkP entryptr;
 {
     DLQ_ASSERT_HEAD(headptr);
     entryptr->dlq_next = headptr;
@@ -81,24 +82,25 @@ dlqLinkb(headptr, entryptr)
 
     headptr->dlq_prev = entryptr;
     entryptr->dlq_prev->dlq_next = entryptr;
-    return(0);
+    return (0);
 }
 
 /* dlqMoveb
  *     move all the items on the fromptr and append to the toptr's list
  */
 
+void
 dlqMoveb(fromptr, toptr)
-     dlqlinkP  fromptr;
-     dlqlinkP  toptr;
+     dlqlinkP fromptr;
+     dlqlinkP toptr;
 {
-    dlqlinkP   tailptr;
+    dlqlinkP tailptr;
 
     DLQ_ASSERT_HEAD(fromptr);
     DLQ_ASSERT_HEAD(toptr);
 
-    if ( dlqEmpty(fromptr) )
-       return(0);
+    if (dlqEmpty(fromptr))
+       return;
 
     tailptr = toptr->dlq_prev;
 
@@ -113,6 +115,7 @@ dlqMoveb(fromptr, toptr)
 
     fromptr->dlq_next = fromptr;
     fromptr->dlq_prev = fromptr;
+    return;
 }
 
 /* dlqUnlinkb
@@ -120,22 +123,22 @@ dlqMoveb(fromptr, toptr)
  */
 
 dlqlinkP
-dlqUnlinkb(headptr) 
-     dlqlinkP  headptr;
+dlqUnlinkb(headptr)
+     dlqlinkP headptr;
 {
-    dlqlinkP   ptr;
+    dlqlinkP ptr;
     DLQ_ASSERT_HEAD(headptr);
 
-    if ( dlqEmpty(headptr) )
-       return(0);
+    if (dlqEmpty(headptr))
+       return (0);
 
     ptr = headptr->dlq_prev;
     ptr->dlq_prev->dlq_next = headptr;
     headptr->dlq_prev = ptr->dlq_prev;
-    
+
     ptr->dlq_next = ptr;
     ptr->dlq_prev = ptr;
-    return(ptr);
+    return (ptr);
 }
 
 /* dlqUnlinkf
@@ -144,13 +147,13 @@ dlqUnlinkb(headptr)
 
 dlqlinkP
 dlqUnlinkf(headptr)
-     dlqlinkP  headptr;
+     dlqlinkP headptr;
 {
-    dlqlinkP   ptr;
+    dlqlinkP ptr;
     DLQ_ASSERT_HEAD(headptr);
 
-    if ( dlqEmpty(headptr) )
-       return(0);
+    if (dlqEmpty(headptr))
+       return (0);
 
     ptr = headptr->dlq_next;
 
@@ -159,7 +162,7 @@ dlqUnlinkf(headptr)
 
     ptr->dlq_next = ptr;
     ptr->dlq_prev = ptr;
-    return(ptr);
+    return (ptr);
 }
 
 /* dlqUnlink
@@ -167,11 +170,10 @@ dlqUnlinkf(headptr)
  */
 
 dlqUnlink(ptr)
-     dlqlinkP    ptr;
+     dlqlinkP ptr;
 {
     /* must not be the queue head */
-    if ( ptr->dlq_type == DLQ_HEAD )
-    {
+    if (ptr->dlq_type == DLQ_HEAD) {
        printf("dlqUnlink: invalid unlink\n");
        exit(1);
     }
@@ -189,55 +191,50 @@ dlqUnlink(ptr)
 
 dlqlinkP
 dlqFront(headptr)
-     dlqlinkP  headptr;
+     dlqlinkP headptr;
 {
     DLQ_ASSERT_HEAD(headptr);
 
-    if ( dlqEmpty(headptr) )
-       return(0);
+    if (dlqEmpty(headptr))
+       return (0);
 
-    return(headptr->dlq_next);
+    return (headptr->dlq_next);
 }
 
 int
 dlqCount(headptr)
-     dlqlinkP  headptr;
+     dlqlinkP headptr;
 {
-    dlqlinkP    ptr;
+    dlqlinkP ptr;
     int count = 0;
 
     DLQ_ASSERT_HEAD(headptr);
 
     ptr = headptr->dlq_next;
-    while ( ptr != headptr )
-    {
+    while (ptr != headptr) {
        ptr = ptr->dlq_next;
        count++;
     }
-    return(count);
+    return (count);
 }
 
 dlqTraverseQueue(headptr, fn1, fn2)
-     dlqlinkP  headptr;
-     int (*fn1)();
-     int (*fn2)();
+     dlqlinkP headptr;
+     int (*fn1) ();
+     int (*fn2) ();
 {
-    dlqlinkP    ptr, oldPtr;
+    dlqlinkP ptr, oldPtr;
 
     DLQ_ASSERT_HEAD(headptr);
 
     ptr = headptr->dlq_next;
-    while ( ptr != headptr )
-    {
+    while (ptr != headptr) {
        if (fn2 && ptr->dlq_structPtr)
-           (*fn2)(ptr->dlq_structPtr);
+           (*fn2) (ptr->dlq_structPtr);
        oldPtr = ptr;
        ptr = ptr->dlq_next;
-       if (fn1) (*fn1)(oldPtr);
+       if (fn1)
+           (*fn1) (oldPtr);
     }
-    return(0);
+    return (0);
 }
-
-
-
-