Take sys/vxworks/memchar from sys/unix instead.

This commit is contained in:
Mara Bos 2020-10-07 20:38:25 +02:00
parent dce405ae3d
commit 08bcaac091
2 changed files with 1 additions and 21 deletions

View File

@ -1,21 +0,0 @@
// Original implementation taken from rust-memchr.
// Copyright 2015 Andrew Gallant, bluss and Nicolas Koch
pub fn memchr(needle: u8, haystack: &[u8]) -> Option<usize> {
let p = unsafe {
libc::memchr(
haystack.as_ptr() as *const libc::c_void,
needle as libc::c_int,
haystack.len(),
)
};
if p.is_null() { None } else { Some(p as usize - (haystack.as_ptr() as usize)) }
}
pub fn memrchr(needle: u8, haystack: &[u8]) -> Option<usize> {
fn memrchr_specific(needle: u8, haystack: &[u8]) -> Option<usize> {
core::slice::memchr::memrchr(needle, haystack)
}
memrchr_specific(needle, haystack)
}

View File

@ -23,6 +23,7 @@ pub mod ext;
pub mod fd;
pub mod fs;
pub mod io;
#[path = "../unix/memchr.rs"]
pub mod memchr;
#[path = "../unix/mutex.rs"]
pub mod mutex;