From 18de8c733f47eedd3ccb9705c2d3bb8464025588 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 11 Apr 1998 11:51:23 +0000 Subject: Update. 1998-04-11 Ulrich Drepper * rt/aio_suspend.c (aio_suspend): Use PTHREAD_COND_INITIALIZER instead of call to pthread_cond_init. * rt/lio_listio.c (lio_listio): Likewise. * rt/lio_listio64.c (lio_listio64): Likewise. * nis/nis_findserv.c: Include sys/socket.h. --- rt/aio_suspend.c | 5 +---- rt/lio_listio.c | 5 +---- rt/lio_listio64.c | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) (limited to 'rt') diff --git a/rt/aio_suspend.c b/rt/aio_suspend.c index ca16342..70c5e1a 100644 --- a/rt/aio_suspend.c +++ b/rt/aio_suspend.c @@ -42,7 +42,7 @@ aio_suspend (list, nent, timeout) { struct waitlist waitlist[nent]; struct requestlist *requestlist[nent]; - pthread_cond_t cond; + pthread_cond_t cond = PTHREAD_COND_INITIALIZER; int cnt; int result = 0; int dummy; @@ -74,9 +74,6 @@ aio_suspend (list, nent, timeout) { int oldstate; - /* Initialize the conditional variable. */ - pthread_cond_init (&cond, NULL); - /* Since `pthread_cond_wait'/`pthread_cond_timedwait' are cancelation points we must be careful. We added entries to the waiting lists which we must remove. So defer cancelation for now. */ diff --git a/rt/lio_listio.c b/rt/lio_listio.c index 07c8d3e..e4d9729 100644 --- a/rt/lio_listio.c +++ b/rt/lio_listio.c @@ -82,13 +82,10 @@ lio_listio (mode, list, nent, sig) } else if (mode == LIO_WAIT) { - pthread_cond_t cond; + pthread_cond_t cond = PTHREAD_COND_INITIALIZER; struct waitlist waitlist[nent]; int oldstate; - /* Initialize the conditional variable. */ - pthread_cond_init (&cond, NULL); - total = 0; for (cnt = 0; cnt < nent; ++cnt) if (list[cnt] != NULL && list[cnt]->aio_lio_opcode != LIO_NOP diff --git a/rt/lio_listio64.c b/rt/lio_listio64.c index 69b78b7..9cb1125 100644 --- a/rt/lio_listio64.c +++ b/rt/lio_listio64.c @@ -82,13 +82,10 @@ lio_listio64 (mode, list, nent, sig) } else if (mode == LIO_WAIT) { - pthread_cond_t cond; + pthread_cond_t cond = PTHREAD_COND_INITIALIZER; struct waitlist waitlist[nent]; int oldstate; - /* Initialize the conditional variable. */ - pthread_cond_init (&cond, NULL); - total = 0; for (cnt = 0; cnt < nent; ++cnt) if (list[cnt] != NULL && list[cnt]->aio_lio_opcode != LIO_NOP -- cgit v1.1