bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make runtime function return size_t

Browse source 
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:
Michael McConville 2015-12-17 21:04:54 -05:00
parent 9687a8a969
commit 5f59e1c8f9
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstd/sys/unix/fs.rs
View file

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

2
src/rt/rust_builtin.c
View file

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