Skip to content

Commit a0aed5a

Browse files
youknowonetgross35
authored andcommitted
fix clippy warnings
(backport <#3855>) (cherry picked from commit a438a21)
1 parent 6b61531 commit a0aed5a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/unix/bsd/apple/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5760,19 +5760,19 @@ f! {
57605760
return ::CMSG_FIRSTHDR(mhdr);
57615761
};
57625762
let cmsg_len = (*cmsg).cmsg_len as usize;
5763-
let next = cmsg as usize + __DARWIN_ALIGN32(cmsg_len as usize);
5763+
let next = cmsg as usize + __DARWIN_ALIGN32(cmsg_len);
57645764
let max = (*mhdr).msg_control as usize
57655765
+ (*mhdr).msg_controllen as usize;
57665766
if next + __DARWIN_ALIGN32(::mem::size_of::<::cmsghdr>()) > max {
5767-
0 as *mut ::cmsghdr
5767+
core::ptr::null_mut()
57685768
} else {
57695769
next as *mut ::cmsghdr
57705770
}
57715771
}
57725772

57735773
pub fn CMSG_DATA(cmsg: *const ::cmsghdr) -> *mut ::c_uchar {
57745774
(cmsg as *mut ::c_uchar)
5775-
.offset(__DARWIN_ALIGN32(::mem::size_of::<::cmsghdr>()) as isize)
5775+
.add(__DARWIN_ALIGN32(::mem::size_of::<::cmsghdr>()))
57765776
}
57775777

57785778
pub {const} fn CMSG_SPACE(length: ::c_uint) -> ::c_uint {

src/unix/bsd/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ f! {
591591
if (*mhdr).msg_controllen as usize >= ::mem::size_of::<::cmsghdr>() {
592592
(*mhdr).msg_control as *mut ::cmsghdr
593593
} else {
594-
0 as *mut ::cmsghdr
594+
core::ptr::null_mut()
595595
}
596596
}
597597

0 commit comments

Comments
 (0)