diff options
| author | Michael McConville <mmcco@mykolab.com> | 2015-12-17 21:04:54 -0500 |
|---|---|---|
| committer | Michael McConville <mmcco@mykolab.com> | 2015-12-17 21:04:54 -0500 |
| commit | 5f59e1c8f9fcd31eae199514abf9d59d09f336c0 (patch) | |
| tree | a9fce949b2fe41f6b47b976fe013316f9a660af1 | |
| parent | 9687a8a96978280824a557d32b30e619f857e6a7 (diff) | |
| download | rust-5f59e1c8f9fcd31eae199514abf9d59d09f336c0.tar.gz rust-5f59e1c8f9fcd31eae199514abf9d59d09f336c0.zip | |
Make runtime function return size_t
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.
| -rw-r--r-- | src/libstd/sys/unix/fs.rs | 4 | ||||
| -rw-r--r-- | src/rt/rust_builtin.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sys/unix/fs.rs b/src/libstd/sys/unix/fs.rs index 8ea8f0c6c77..4b4310a1477 100644 --- a/src/libstd/sys/unix/fs.rs +++ b/src/libstd/sys/unix/fs.rs @@ -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() -> 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; diff --git a/src/rt/rust_builtin.c b/src/rt/rust_builtin.c index af15bda4c3d..c2168d785b9 100644 --- a/src/rt/rust_builtin.c +++ b/src/rt/rust_builtin.c @@ -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); } |
