drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cygwin: POSIX msg queues: simplify mq_close 

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2021-05-25 16:36:09 +02:00
parent 15c96f2b26
commit 2cc914a34e
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/fhandler_mqueue.cc
View File

@ -180,9 +180,8 @@ fhandler_mqueue::close ()
NtClose (mqinfo ()->mqi_waitsend); NtClose (mqinfo ()->mqi_waitsend);
NtClose (mqinfo ()->mqi_waitrecv); NtClose (mqinfo ()->mqi_waitrecv);
NtClose (mqinfo ()->mqi_lock); NtClose (mqinfo ()->mqi_lock);
ret = 0;
} }
__except (EFAULT) {} __except (0) {}
__endtry __endtry
return ret; return 0;
} }

5
winsup/cygwin/posix_ipc.cc
View File

@ -882,13 +882,10 @@ mq_timedreceive (mqd_t mqd, char *ptr, size_t maxlen, unsigned int *priop,
extern "C" int extern "C" int
mq_close (mqd_t mqd) mq_close (mqd_t mqd)
{ {
struct mq_info *mqinfo;
__try __try
{ {
cygheap_fdget fd ((int) mqd, true); cygheap_fdget fd ((int) mqd, true);
mqinfo = get_mqinfo (fd); if (!fd->is_mqueue ())
if (mqinfo->mqi_magic != MQI_MAGIC)
{ {
set_errno (EBADF); set_errno (EBADF);
__leave; __leave;