Skip to content

Make runtime function return size_t #30454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 20, 2015
Merged

Make runtime function return size_t #30454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f59e1c
Make runtime function return size_t
mmcco Dec 18, 2015
cf03cee
Add a type prefix to fix build
mmcco Dec 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/libstd/sys/unix/fs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/rt/rust_builtin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down