Skip to content

Commit 33e2bb4

Browse files
author
Gleb Pomykalov
committed
improve naming
1 parent bc80369 commit 33e2bb4

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

src/sys/socket/mod.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -761,11 +761,9 @@ impl<'a> ControlMessage<'a> {
761761
unsafe{CMSG_LEN(self.len() as libc::c_uint)}
762762
}
763763

764-
765-
766764
/// Return a reference to the payload data as a byte pointer
767-
fn write_data(&self, cmsg_data: *mut u8) {
768-
let write_data_ptr = match self {
765+
fn copy_to_cmsg_data(&self, cmsg_data: *mut u8) {
766+
let data_ptr = match self {
769767
&ControlMessage::ScmRights(fds) => {
770768
fds as *const _ as *const u8
771769
},
@@ -776,7 +774,7 @@ impl<'a> ControlMessage<'a> {
776774
#[cfg(any(target_os = "android", target_os = "linux"))]
777775
&ControlMessage::AlgSetIv(iv) => {
778776
unsafe {
779-
let alg_iv: *mut libc::af_alg_iv = mem::transmute(cmsg_data);
777+
let alg_iv = cmsg_data as *mut libc::af_alg_iv;
780778
(*alg_iv).ivlen = iv.len() as u32;
781779
ptr::copy_nonoverlapping(
782780
iv.as_ptr(),
@@ -797,7 +795,7 @@ impl<'a> ControlMessage<'a> {
797795
};
798796
unsafe {
799797
ptr::copy_nonoverlapping(
800-
write_data_ptr,
798+
data_ptr,
801799
cmsg_data,
802800
self.len()
803801
)
@@ -869,7 +867,7 @@ impl<'a> ControlMessage<'a> {
869867
(*cmsg).cmsg_level = self.cmsg_level();
870868
(*cmsg).cmsg_type = self.cmsg_type();
871869
(*cmsg).cmsg_len = self.cmsg_len();
872-
self.write_data(CMSG_DATA(cmsg));
870+
self.copy_to_cmsg_data(CMSG_DATA(cmsg));
873871
}
874872
}
875873

0 commit comments

Comments
 (0)