vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'arpainet-followup' into 'master'

Browse Source 
apply some clippy lints to arpa_inet header

See merge request redox-os/relibc!1452
This commit is contained in:
Jeremy Soller
2026-06-11 06:35:26 -06:00
parent 8173c9cdec 805b920bd8
commit 78b05d3297
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/header/arpa_inet/mod.rs
+5 -6
View File
@@ -291,11 +291,11 @@ pub unsafe extern "C" fn inet_pton(af: c_int, src: *const c_char, dst: *mut c_vo
} else if af == AF_INET6 {
let src_str = unsafe { str::from_utf8_unchecked(CStr::from_ptr(src).to_bytes()) };
let mut chunks = vec![src_str];
let colons = src_str.bytes().filter(|&c| c == ':' as u8).count();
if colons > 7 || colons < 2 {
let colons = src_str.bytes().filter(|&c| c == b':').count();
if !(2..=7).contains(&colons) {
return 0;
}
let dots = src_str.bytes().filter(|&c| c == '.' as u8).count();
let dots = src_str.bytes().filter(|&c| c == b'.').count();
if dots != 0 && dots != 3 {
return 0;
}
@@ -309,10 +309,9 @@ pub unsafe extern "C" fn inet_pton(af: c_int, src: *const c_char, dst: *mut c_vo
if dots == 3
&& let Some(first_dot) = src_str.find('.')
&& let Some(last_colon) = src_str.find(':')
&& last_colon > first_dot
{
if last_colon > first_dot {
return 0;
}
return 0;
}
if let Some(first) = src_str.find("::")
&& let Some(last) = src_str.rfind("::")