Auto merge of #30454 - mmcco:size_t, r=alexcrichton

It returns sizeof(dirent_t), so I'm not sure why its return type is int.
It's only used once, and that usage immediately casts it to usize.
This commit is contained in:
bors 2015-12-20 07:19:07 +00:00
commit d3aec9fd20
2 changed files with 3 additions and 3 deletions

View File

@ -127,11 +127,11 @@ impl Iterator for ReadDir {
fn next(&mut self) -> Option<io::Result<DirEntry>> {
extern {
fn rust_dirent_t_size() -> c_int;
fn rust_dirent_t_size() -> libc::size_t;
}
let mut buf: Vec<u8> = Vec::with_capacity(unsafe {
rust_dirent_t_size() as usize
rust_dirent_t_size()
});
let ptr = buf.as_mut_ptr() as *mut libc::dirent;

View File

@ -77,7 +77,7 @@ rust_readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result) {
return readdir_r(dirp, entry, result);
}
int
size_t
rust_dirent_t_size() {
return sizeof(struct dirent);
}