summaryrefslogtreecommitdiffstats
path: root/lib/libpthread/uthread/uthread_file.c
diff options
context:
space:
mode:
authormarc <marc@openbsd.org>2004-06-07 21:11:23 +0000
committermarc <marc@openbsd.org>2004-06-07 21:11:23 +0000
commitf91de67f292fa8f5ed29aa37e5f5b87d8645664d (patch)
treedab54fdaea4206ab36fc68dc883c9be239ea81d6 /lib/libpthread/uthread/uthread_file.c
parentCorrectly handle an unaligned long long parameter on stack in varargs functions; (diff)
downloadwireguard-openbsd-f91de67f292fa8f5ed29aa37e5f5b87d8645664d.tar.xz
wireguard-openbsd-f91de67f292fa8f5ed29aa37e5f5b87d8645664d.zip
major bump to libc and libpthread to break the dependency of a
particular implementation of libpthread for libc. libc no longer needs pthread.h to compile. OK millert@, brad@, tedu@
Diffstat (limited to 'lib/libpthread/uthread/uthread_file.c')
-rw-r--r--lib/libpthread/uthread/uthread_file.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/lib/libpthread/uthread/uthread_file.c b/lib/libpthread/uthread/uthread_file.c
index b50174c0d2b..71c0ffc35aa 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.10 2003/01/31 04:46:17 marc Exp $ */
+/* $OpenBSD: uthread_file.c,v 1.11 2004/06/07 21:11:23 marc Exp $ */
/*
* Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
@@ -173,7 +173,7 @@ do_lock(int idx, FILE *fp)
}
void
-_flockfile_debug(FILE * fp, char *fname, int lineno)
+flockfile(FILE * fp)
{
int idx = file_idx(fp);
struct file_lock *p;
@@ -230,19 +230,12 @@ _flockfile_debug(FILE * fp, char *fname, int lineno)
_SPINUNLOCK(&hash_lock);
/* Wait on the FILE lock: */
- _thread_kern_sched_state(PS_FILE_WAIT, fname, lineno);
+ _thread_kern_sched_state(PS_FILE_WAIT, "", 0);
}
}
return;
}
-void
-flockfile(FILE * fp)
-{
- _flockfile_debug(fp, (char *) "?", 1);
- return;
-}
-
int
ftrylockfile(FILE * fp)
{