From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/485 Path: news.gmane.org!not-for-mail From: Szabolcs Nagy Newsgroups: gmane.linux.lib.musl.general Subject: aio_fildes bug Date: Wed, 28 Sep 2011 09:45:58 +0200 Message-ID: <20110928074558.GE24939@port70.net> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="6WlEvdN9Dv0WHSBl" X-Trace: dough.gmane.org 1317195976 18576 80.91.229.12 (28 Sep 2011 07:46:16 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 28 Sep 2011 07:46:16 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-486-gllmg-musl=m.gmane.org@lists.openwall.com Wed Sep 28 09:46:11 2011 Return-path: Envelope-to: gllmg-musl@lo.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by lo.gmane.org with smtp (Exim 4.69) (envelope-from ) id 1R8oqJ-0008PV-N1 for gllmg-musl@lo.gmane.org; Wed, 28 Sep 2011 09:46:11 +0200 Original-Received: (qmail 25769 invoked by uid 550); 28 Sep 2011 07:46:10 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Original-Received: (qmail 25761 invoked from network); 28 Sep 2011 07:46:10 -0000 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Xref: news.gmane.org gmane.linux.lib.musl.general:485 Archived-At: --6WlEvdN9Dv0WHSBl Content-Type: text/plain; charset=us-ascii Content-Disposition: inline s/filedes/fildes/ what a silly name.. http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/aio.h.html --6WlEvdN9Dv0WHSBl Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="aio_fildes.diff" diff --git a/include/aio.h b/include/aio.h index ce7b426..4cc0490 100644 --- a/include/aio.h +++ b/include/aio.h @@ -17,7 +17,7 @@ extern "C" { #include struct aiocb { - int aio_filedes, aio_lio_opcode, aio_reqprio; + int aio_fildes, aio_lio_opcode, aio_reqprio; volatile void *aio_buf; size_t aio_nbytes; struct sigevent aio_sigevent; diff --git a/src/aio/aio_readwrite.c b/src/aio/aio_readwrite.c index adb5688..584ccb3 100644 --- a/src/aio/aio_readwrite.c +++ b/src/aio/aio_readwrite.c @@ -23,7 +23,7 @@ static void notify_signal(struct sigevent *sev) static void *io_thread(void *p) { struct aiocb *cb = p; - int fd = cb->aio_filedes; + int fd = cb->aio_fildes; void *buf = (void *)cb->aio_buf; size_t len = cb->aio_nbytes; off_t off = cb->aio_offset; --6WlEvdN9Dv0WHSBl--