diff options
author | amanda-tait <atait@google.com> | 2020-07-27 22:03:13 -0400 |
---|---|---|
committer | amanda-tait <atait@google.com> | 2020-07-27 22:03:13 -0400 |
commit | 5d116747c3bc844edb47f29990ead548ae7841c3 (patch) | |
tree | 59d3acaf7175c2e8dc864d252e4543e34df131ab | |
parent | 59749267fa458952b33d259f51e7f195b6434fc1 (diff) | |
download | rust-libc-5d116747c3bc844edb47f29990ead548ae7841c3.tar.gz |
Fix style in CMSG_* "macros" for fuchsia
This change addresses two style errors found in PR review:
* indent and linebreak in CMSG_NXTHDR
* prefer `0 as *mut cmsghdr` over `core::ptr::nul_mut()`
-rw-r--r-- | src/fuchsia/mod.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/fuchsia/mod.rs b/src/fuchsia/mod.rs index ecaf16c25c..b3ff29f1e5 100644 --- a/src/fuchsia/mod.rs +++ b/src/fuchsia/mod.rs @@ -3255,13 +3255,14 @@ f! { cmsg.offset(1) as *mut c_uchar } - pub fn CMSG_NXTHDR(mhdr: *const msghdr, cmsg: *const cmsghdr) -> - *mut cmsghdr { + pub fn CMSG_NXTHDR(mhdr: *const msghdr, cmsg: *const cmsghdr) + -> *mut cmsghdr + { if ((*cmsg).cmsg_len as ::size_t) < ::mem::size_of::<cmsghdr>() { - core::ptr::null_mut() + 0 as *mut cmsghdr } else if __CMSG_NEXT(cmsg).add(::mem::size_of::<cmsghdr>()) >= __MHDR_END(mhdr) { - core::ptr::null_mut() + 0 as *mut cmsghdr } else { __CMSG_NEXT(cmsg).cast() } @@ -3271,7 +3272,7 @@ f! { if (*mhdr).msg_controllen as ::size_t >= ::mem::size_of::<cmsghdr>() { (*mhdr).msg_control.cast() } else { - core::ptr::null_mut() + 0 as *mut cmsghdr } } |