diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-01-19 23:30:40 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-01-19 23:30:40 +0100 |
| commit | c7a84af651ae5cf2588c4a057564f9c2189846ef (patch) | |
| tree | 65e1e0349703b3c8ab88748107d054584e71a470 /ipc | |
| parent | 569df850cd7badd1e36132ad3b44aa76a4d27c25 (diff) | |
| download | gnumach-c7a84af651ae5cf2588c4a057564f9c2189846ef.tar.gz gnumach-c7a84af651ae5cf2588c4a057564f9c2189846ef.tar.bz2 gnumach-c7a84af651ae5cf2588c4a057564f9c2189846ef.zip | |
Rename msg_is_misaligned and msg_align
message.h is installed so we need to hide these behind a mach_ prefix
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/ipc_kmsg.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/ipc/ipc_kmsg.c b/ipc/ipc_kmsg.c index 8bb20a18..2c9d4988 100644 --- a/ipc/ipc_kmsg.c +++ b/ipc/ipc_kmsg.c @@ -231,8 +231,8 @@ ipc_kmsg_clean_body( if (((mach_msg_type_t*)type)->msgt_longform) { /* This must be aligned */ if ((sizeof(natural_t) > sizeof(mach_msg_type_t)) && - (msg_is_misaligned(type))) { - saddr = msg_align(saddr); + (mach_msg_is_misaligned(type))) { + saddr = mach_msg_align(saddr); continue; } name = type->msgtl_name; @@ -249,7 +249,7 @@ ipc_kmsg_clean_body( /* padding (ptrs and ports) ? */ if ((sizeof(natural_t) > sizeof(mach_msg_type_t)) && ((size >> 3) == sizeof(natural_t))) - saddr = msg_align(saddr); + saddr = mach_msg_align(saddr); /* calculate length of data in bytes, rounding up */ @@ -392,8 +392,8 @@ xxx: type = (mach_msg_type_long_t *) eaddr; if (((mach_msg_type_t*)type)->msgt_longform) { /* This must be aligned */ if ((sizeof(natural_t) > sizeof(mach_msg_type_t)) && - (msg_is_misaligned(type))) { - eaddr = msg_align(eaddr); + (mach_msg_is_misaligned(type))) { + eaddr = mach_msg_align(eaddr); goto xxx; } name = type->msgtl_name; @@ -410,7 +410,7 @@ xxx: type = (mach_msg_type_long_t *) eaddr; /* padding (ptrs and ports) ? */ if ((sizeof(natural_t) > sizeof(mach_msg_type_t)) && ((size >> 3) == sizeof(natural_t))) - eaddr = msg_align(eaddr); + eaddr = mach_msg_align(eaddr); /* calculate length of data in bytes, rounding up */ @@ -1332,8 +1332,8 @@ ipc_kmsg_copyin_body( if (longform) { /* This must be aligned */ if ((sizeof(natural_t) > sizeof(mach_msg_type_t)) && - (msg_is_misaligned(type))) { - saddr = msg_align(saddr); + (mach_msg_is_misaligned(type))) { + saddr = mach_msg_align(saddr); continue; } name = type->msgtl_name; @@ -1362,7 +1362,7 @@ ipc_kmsg_copyin_body( /* padding (ptrs and ports) ? */ if ((sizeof(natural_t) > sizeof(mach_msg_type_t)) && ((size >> 3) == sizeof(natural_t))) - saddr = msg_align(saddr); + saddr = mach_msg_align(saddr); /* calculate length of data in bytes, rounding up */ @@ -1385,7 +1385,7 @@ ipc_kmsg_copyin_body( vm_offset_t addr; if (MACH_MSG_ALIGNMENT > sizeof(mach_msg_type_t)) - saddr = msg_align(saddr); + saddr = mach_msg_align(saddr); if ((eaddr - saddr) < sizeof(vm_offset_t)) { ipc_kmsg_clean_partial(kmsg, taddr, FALSE, 0); @@ -1615,8 +1615,8 @@ ipc_kmsg_copyin_from_kernel(ipc_kmsg_t kmsg) if (longform) { /* This must be aligned */ if ((sizeof(natural_t) > sizeof(mach_msg_type_t)) && - (msg_is_misaligned(type))) { - saddr = msg_align(saddr); + (mach_msg_is_misaligned(type))) { + saddr = mach_msg_align(saddr); continue; } name = type->msgtl_name; @@ -1633,7 +1633,7 @@ ipc_kmsg_copyin_from_kernel(ipc_kmsg_t kmsg) /* padding (ptrs and ports) ? */ if ((sizeof(natural_t) > sizeof(mach_msg_type_t)) && ((size >> 3) == sizeof(natural_t))) - saddr = msg_align(saddr); + saddr = mach_msg_align(saddr); /* calculate length of data in bytes, rounding up */ @@ -2388,8 +2388,8 @@ ipc_kmsg_copyout_body( if (longform) { /* This must be aligned */ if ((sizeof(natural_t) > sizeof(mach_msg_type_t)) && - (msg_is_misaligned(type))) { - saddr = msg_align(saddr); + (mach_msg_is_misaligned(type))) { + saddr = mach_msg_align(saddr); continue; } name = type->msgtl_name; @@ -2406,7 +2406,7 @@ ipc_kmsg_copyout_body( /* padding (ptrs and ports) ? */ if ((sizeof(natural_t) > sizeof(mach_msg_type_t)) && ((size >> 3) == sizeof(natural_t))) - saddr = msg_align(saddr); + saddr = mach_msg_align(saddr); /* calculate length of data in bytes, rounding up */ @@ -2450,7 +2450,7 @@ ipc_kmsg_copyout_body( vm_offset_t data; if (MACH_MSG_ALIGNMENT > sizeof(mach_msg_type_t)) - saddr = msg_align(saddr); + saddr = mach_msg_align(saddr); data = * (vm_offset_t *) saddr; @@ -2827,8 +2827,8 @@ ipc_msg_print(mach_msg_header_t *msgh) if (longform) { /* This must be aligned */ if ((sizeof(natural_t) > sizeof(mach_msg_type_t)) && - (msg_is_misaligned(type))) { - saddr = msg_align(saddr); + (mach_msg_is_misaligned(type))) { + saddr = mach_msg_align(saddr); continue; } name = type->msgtl_name; @@ -2873,7 +2873,7 @@ ipc_msg_print(mach_msg_header_t *msgh) /* padding (ptrs and ports) ? */ if ((sizeof(natural_t) > sizeof(mach_msg_type_t)) && ((size >> 3) == sizeof(natural_t))) - saddr = msg_align(saddr); + saddr = mach_msg_align(saddr); /* calculate length of data in bytes, rounding up */ |