diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2015-09-03 09:49:50 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2015-09-03 09:49:50 +0300 |
| commit | 06fb196256bbab1e7aa4f43daf45321efaa6e0eb (patch) | |
| tree | 23863826af019b2bc07d295882e092d244c36699 /src/libstd/sys/windows/fs.rs | |
| parent | 3903ea96f557dc923cf73d3905554083cd921a01 (diff) | |
| download | rust-06fb196256bbab1e7aa4f43daf45321efaa6e0eb.tar.gz rust-06fb196256bbab1e7aa4f43daf45321efaa6e0eb.zip | |
Use `null()`/`null_mut()` instead of `0 as *const T`/`0 as *mut T`
Diffstat (limited to 'src/libstd/sys/windows/fs.rs')
| -rw-r--r-- | src/libstd/sys/windows/fs.rs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/libstd/sys/windows/fs.rs b/src/libstd/sys/windows/fs.rs index d413d536cc8..e9d98b36a43 100644 --- a/src/libstd/sys/windows/fs.rs +++ b/src/libstd/sys/windows/fs.rs @@ -328,12 +328,12 @@ impl File { try!(cvt({ c::DeviceIoControl(self.handle.raw(), c::FSCTL_GET_REPARSE_POINT, - 0 as *mut _, + ptr::null_mut(), 0, space.as_mut_ptr() as *mut _, space.len() as libc::DWORD, &mut bytes, - 0 as *mut _) + ptr::null_mut()) })); Ok((bytes, &*(space.as_ptr() as *const c::REPARSE_DATA_BUFFER))) } @@ -680,15 +680,15 @@ fn directory_junctions_are_directories() { c::FSCTL_SET_REPARSE_POINT, data.as_ptr() as *mut _, (*db).ReparseDataLength + 8, - 0 as *mut _, 0, + ptr::null_mut(), 0, &mut ret, - 0 as *mut _)).map(|_| ()) + ptr::null_mut())).map(|_| ()) } } fn opendir(p: &Path, write: bool) -> io::Result<File> { unsafe { - let mut token = 0 as *mut _; + let mut token = ptr::null_mut(); let mut tp: c::TOKEN_PRIVILEGES = mem::zeroed(); try!(cvt(c::OpenProcessToken(c::GetCurrentProcess(), c::TOKEN_ADJUST_PRIVILEGES, @@ -699,14 +699,14 @@ fn directory_junctions_are_directories() { "SeBackupPrivilege".as_ref() }; let name = name.encode_wide().chain(Some(0)).collect::<Vec<_>>(); - try!(cvt(c::LookupPrivilegeValueW(0 as *const _, + try!(cvt(c::LookupPrivilegeValueW(ptr::null(), name.as_ptr(), &mut tp.Privileges[0].Luid))); tp.PrivilegeCount = 1; tp.Privileges[0].Attributes = c::SE_PRIVILEGE_ENABLED; let size = mem::size_of::<c::TOKEN_PRIVILEGES>() as libc::DWORD; try!(cvt(c::AdjustTokenPrivileges(token, libc::FALSE, &mut tp, size, - 0 as *mut _, 0 as *mut _))); + ptr::null_mut(), ptr::null_mut()))); try!(cvt(libc::CloseHandle(token))); File::open_reparse_point(p, write) @@ -726,9 +726,9 @@ fn directory_junctions_are_directories() { c::FSCTL_DELETE_REPARSE_POINT, data.as_ptr() as *mut _, (*db).ReparseDataLength + 8, - 0 as *mut _, 0, + ptr::null_mut(), 0, &mut bytes, - 0 as *mut _)).map(|_| ()) + ptr::null_mut())).map(|_| ()) } } } |
