pull-prototypes-to-head-20020821

[openafs.git] / src / volser / lockprocs.c

diff --git a/src/volser/lockprocs.c b/src/volser/lockprocs.c
index b52f3e8..f9e8934 100644 (file)
--- a/src/volser/lockprocs.c
+++ b/src/volser/lockprocs.c
@@ -25,6 +25,13 @@ RCSID("$Header$");
 #else
 #include <netinet/in.h>
 #endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
 #include <afs/voldefs.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
@@ -142,7 +149,7 @@ Lp_QInit(ahead)
      struct qHead *ahead;
 {
    ahead->count = 0;
-   ahead->next  = (struct aqueue *)0;
+   ahead->next  = NULL;
 }
 
 /*add <elem> in front of queue <ahead> */
@@ -155,7 +162,7 @@ Lp_QAdd(ahead,elem)
     if(ahead->count == 0) {
        ahead->count += 1;
        ahead->next = elem;
-       elem->next = (struct aqueue *)0;
+       elem->next = NULL;
     }
     else {
        temp = ahead->next;
@@ -173,7 +180,7 @@ Lp_QScan(ahead,id,success, elem)
 {   struct aqueue *cptr;
 
     cptr = ahead->next;
-    while(cptr != (struct aqueue *)0) {
+    while(cptr != NULL) {
        if(cptr->ids[RWVOL] == id) {
            *success = 1;
            *elem = cptr;
@@ -205,7 +212,7 @@ Lp_QEnumerate(ahead,success, elem)
            elem->copyDate[i] = temp->copyDate[i];
            elem->isValid[i] = temp->isValid[i];
        }
-       elem->next = (struct aqueue *)0;
+       elem->next = NULL;
        *success = 1;
        free(temp);
     }