summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorOtto Moerbeek <otto@cvs.openbsd.org>2005-10-14 06:53:02 +0000
committerOtto Moerbeek <otto@cvs.openbsd.org>2005-10-14 06:53:02 +0000
commit7c5b24fb4129d7cd7382fb8a2466baedc650b957 (patch)
tree1eeadd99e155392bff73b356feedd9e74882a040 /lib
parentfe5ec9403f14728b29380920df95eca3fdac745d (diff)
Use queue macros instead of directly accessing fields. ok marc@ miod@
patrick@
Diffstat (limited to 'lib')
-rw-r--r--lib/libpthread/uthread/uthread_file.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libpthread/uthread/uthread_file.c b/lib/libpthread/uthread/uthread_file.c
index 71c0ffc35aa..41f62ee7357 100644
--- a/lib/libpthread/uthread/uthread_file.c
+++ b/lib/libpthread/uthread/uthread_file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uthread_file.c,v 1.11 2004/06/07 21:11:23 marc Exp $ */
+/* $OpenBSD: uthread_file.c,v 1.12 2005/10/14 06:53:01 otto Exp $ */
/*
* Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
@@ -110,7 +110,7 @@ find_lock(int idx, FILE *fp)
p = &flh[idx].fl;
else {
/* Point to the first dynamic lock: */
- p = flh[idx].head.lh_first;
+ p = LIST_FIRST(&flh[idx].head);
/*
* Loop through the dynamic locks looking for the
@@ -118,7 +118,7 @@ find_lock(int idx, FILE *fp)
*/
while (p != NULL && (p->fp != fp || p->owner == NULL))
/* Not this file, try the next: */
- p = p->entry.le_next;
+ p = LIST_NEXT(p, entry);
}
return(p);
}
@@ -140,7 +140,7 @@ do_lock(int idx, FILE *fp)
}
else {
/* Point to the first dynamic lock: */
- p = flh[idx].head.lh_first;
+ p = LIST_FIRST(&flh[idx].head);
/*
* Loop through the dynamic locks looking for a
@@ -148,7 +148,7 @@ do_lock(int idx, FILE *fp)
*/
while (p != NULL && p->owner != NULL)
/* This one is used, try the next: */
- p = p->entry.le_next;
+ p = LIST_NEXT(p, entry);
}
/*