Skip to content

Commit a7da4c5

Browse files
committed
Fix conversions
1 parent 19e1899 commit a7da4c5

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/backend/libc/net/netdevice.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use crate::io;
88
use crate::net::netdevice::open_socket;
99
#[cfg(feature = "alloc")]
1010
use libc::SIOCGIFNAME;
11-
use libc::{__c_anonymous_ifr_ifru, ifreq, IFNAMSIZ, SIOCGIFINDEX};
11+
use libc::{__c_anonymous_ifr_ifru, c_char, ifreq, IFNAMSIZ, SIOCGIFINDEX};
1212

1313
#[cfg(target_os = "linux")]
1414
pub(crate) fn name_to_index(if_name: &str) -> io::Result<u32> {
@@ -22,11 +22,11 @@ pub(crate) fn name_to_index(if_name: &str) -> io::Result<u32> {
2222
ifr_ifru: __c_anonymous_ifr_ifru { ifru_ifindex: 0 },
2323
};
2424

25-
let mut if_name_i8_iter = if_name_bytes.iter().map(|byte| *byte as i8);
26-
ifreq.ifr_name[..if_name_bytes.len()].fill_with(|| if_name_i8_iter.next().unwrap());
25+
let mut if_name_c_char_iter = if_name_bytes.iter().map(|byte| *byte as c_char);
26+
ifreq.ifr_name[..if_name_bytes.len()].fill_with(|| if_name_c_char_iter.next().unwrap());
2727

2828
let fd = open_socket()?;
29-
unsafe { ioctl(fd.as_fd(), SIOCGIFINDEX, &mut ifreq as *mut ifreq as _) }?;
29+
unsafe { ioctl(fd.as_fd(), SIOCGIFINDEX as _, &mut ifreq as *mut ifreq as _) }?;
3030
let index = unsafe { ifreq.ifr_ifru.ifru_ifindex };
3131
Ok(index as u32)
3232
}
@@ -46,7 +46,7 @@ pub(crate) fn index_to_name(index: u32) -> io::Result<String> {
4646
let Some(nul_byte) = ifreq.ifr_name.iter().position(|char| *char == 0) else {
4747
return Err(io::Errno::INVAL);
4848
};
49-
let name = ifreq.ifr_name[..nul_byte]
49+
let name: String = ifreq.ifr_name[..nul_byte]
5050
.iter()
5151
.map(|v| *v as u8 as char)
5252
.collect();

0 commit comments

Comments
 (0)