OpenE2K/libc-rs
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #750 - agrover:fix-devt-minor, r=alexcrichton

Browse Source 
Fix dev_t minor() bitmasking on Linux

This code appears to be modeled on the macros in glibc bits/sysmacros.h
(since Glibc 2.26). Fix the masking of bits for minor() to match that
implementation, which also corresponds with the explanatory comment in
that file.
This commit is contained in:
bors 2017-08-30 22:51:38 +00:00
commit 9100c0fde9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/unix/notbsd/linux/mod.rs
View File

@ -962,7 +962,7 @@ f! {
pub fn minor(dev: ::dev_t) -> ::c_uint { pub fn minor(dev: ::dev_t) -> ::c_uint {
let mut minor = 0; let mut minor = 0;
minor |= (dev & 0xfffff00000000000) >> 0; minor |= (dev & 0x00000000000000ff) >> 0;
minor |= (dev & 0x00000ffffff00000) >> 12; minor |= (dev & 0x00000ffffff00000) >> 12;
minor as ::c_uint minor as ::c_uint
} }