diff options
| author | Flavio Cruz <flaviocruz@gmail.com> | 2023-05-06 16:55:10 -0400 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-05-06 23:10:55 +0200 |
| commit | 84b4a81aebdb3a0dab335914ebb83faa67eb7df2 (patch) | |
| tree | 77a7824f7dcf9933d78df70b470ed41e0af3f748 /hurd/hurdselect.c | |
| parent | e64b7c26d45bc54130d9381711c592d85ff5db6a (diff) | |
| download | glibc-84b4a81aebdb3a0dab335914ebb83faa67eb7df2.tar.gz glibc-84b4a81aebdb3a0dab335914ebb83faa67eb7df2.tar.xz glibc-84b4a81aebdb3a0dab335914ebb83faa67eb7df2.zip | |
Update hurd/hurdselect.c to be more portable.
Summary of changes: - Use BAD_TYPECHECK to perform type checking in a cleaner way. BAD_TYPECHECK is moved into sysdeps/mach/rpc.h to avoid duplication. - Remove assertions for mach_msg_type_t since those won't work for x86_64. - Update message structs to use mach_msg_type_t directly. - Use designated initializers. Message-Id: <ZFa+roan3ioo0ONM@jupiter.tail36e24.ts.net>
Diffstat (limited to 'hurd/hurdselect.c')
| -rw-r--r-- | hurd/hurdselect.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/hurd/hurdselect.c b/hurd/hurdselect.c index 08fcc92170..9630cae474 100644 --- a/hurd/hurdselect.c +++ b/hurd/hurdselect.c @@ -22,6 +22,7 @@ #include <hurd.h> #include <hurd/fd.h> #include <hurd/io_request.h> +#include <mach_rpc.h> #include <stdlib.h> #include <string.h> #include <assert.h> @@ -69,14 +70,6 @@ _hurd_select (int nfds, sigset_t oset; struct hurd_sigstate *ss = NULL; - union typeword /* Use this to avoid unkosher casts. */ - { - mach_msg_type_t type; - uint32_t word; - }; - assert (sizeof (union typeword) == sizeof (mach_msg_type_t)); - assert (sizeof (uint32_t) == sizeof (mach_msg_type_t)); - if (nfds < 0 || (pollfds == NULL && nfds > FD_SETSIZE)) { errno = EINVAL; @@ -404,15 +397,15 @@ _hurd_select (int nfds, struct { mach_msg_header_t head; - union typeword err_type; + mach_msg_type_t err_type; error_t err; } error; struct { mach_msg_header_t head; - union typeword err_type; + mach_msg_type_t err_type; error_t err; - union typeword result_type; + mach_msg_type_t result_type; int result; } success; #endif @@ -443,9 +436,14 @@ _hurd_select (int nfds, /* We got a message. Decode it. */ #ifdef MACH_MSG_TYPE_BIT - const union typeword inttype = - { type: - { MACH_MSG_TYPE_INTEGER_T, sizeof (integer_t) * 8, 1, 1, 0, 0 } + static const mach_msg_type_t inttype = { + .msgt_name = MACH_MSG_TYPE_INTEGER_T, + .msgt_size = sizeof (integer_t) * 8, + .msgt_number = 1, + .msgt_inline = TRUE, + .msgt_longform = FALSE, + .msgt_deallocate = FALSE, + .msgt_unused = 0 }; #endif @@ -462,7 +460,7 @@ _hurd_select (int nfds, && msg.head.msgh_size >= sizeof msg.error && !(msg.head.msgh_bits & MACH_MSGH_BITS_COMPLEX) #ifdef MACH_MSG_TYPE_BIT - && msg.error.err_type.word == inttype.word + && !BAD_TYPECHECK (&msg.error.err_type, &inttype) #endif ) { @@ -480,7 +478,7 @@ _hurd_select (int nfds, occurred. */ if (msg.error.err #ifdef MACH_MSG_TYPE_BIT - || msg.success.result_type.word != inttype.word + || BAD_TYPECHECK (&msg.success.result_type, &inttype) #endif || msg.head.msgh_size != sizeof msg.success) { |