Simplify clist_search_string_nocase using Iterator interface

This commit is contained in:
Dmitry Bogatov
2019-09-06 13:02:28 +00:00
parent a4e4b0fc17
commit dc1839760c

View File

@@ -436,19 +436,11 @@ pub unsafe fn clist_search_string_nocase(
haystack: *const clist, haystack: *const clist,
needle: *const libc::c_char, needle: *const libc::c_char,
) -> libc::c_int { ) -> libc::c_int {
let mut iter = (*haystack).first; for data in &*haystack {
if strcasecmp(data.cast(), needle) == 0 {
while !iter.is_null() {
if strcasecmp((*iter).data as *const libc::c_char, needle) == 0 {
return 1; return 1;
} }
iter = if !iter.is_null() {
(*iter).next
} else {
ptr::null_mut()
} }
}
0 0
} }