Skip to content

Commit 1fbb4b9

Browse files
qinghontgross35
authored andcommitted
openbsd: better format
1 parent e055b0c commit 1fbb4b9

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

src/unix/bsd/netbsdlike/netbsd/mod.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use crate::prelude::*;
2-
use crate::unix::bsd::IOCPARM_MASK;
32
use crate::{cmsghdr, off_t};
43

54
pub type clock_t = c_uint;
@@ -1718,18 +1717,18 @@ pub const IOCPARM_SHIFT: u32 = 16;
17181717
pub const IOCGROUP_SHIFT: u32 = 8;
17191718

17201719
pub const fn IOCPARM_LEN(x: u32) -> u32 {
1721-
(x >> IOCPARM_SHIFT) & IOCPARM_MASK
1720+
(x >> IOCPARM_SHIFT) & crate::IOCPARM_MASK
17221721
}
17231722

17241723
pub const fn IOCBASECMD(x: u32) -> u32 {
1725-
x & (!(IOCPARM_MASK << IOCPARM_SHIFT))
1724+
x & (!(crate::IOCPARM_MASK << IOCPARM_SHIFT))
17261725
}
17271726

17281727
pub const fn IOCGROUP(x: u32) -> u32 {
17291728
(x >> IOCGROUP_SHIFT) & 0xff
17301729
}
17311730
pub const fn _IOC(inout: u32, group: u32, num: u32, len: u32) -> u32 {
1732-
(inout) | (((len) & IOCPARM_MASK) << IOCPARM_SHIFT) | ((group) << IOCGROUP_SHIFT) | (num)
1731+
(inout) | (((len) & crate::IOCPARM_MASK) << IOCPARM_SHIFT) | ((group) << IOCGROUP_SHIFT) | (num)
17331732
}
17341733

17351734
//<sys/timex.h>

src/unix/bsd/netbsdlike/openbsd/mod.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use crate::prelude::*;
22
use crate::unix::bsd::O_SYNC;
3-
use crate::unix::bsd::IOCPARM_MASK;
43
use crate::{cmsghdr, off_t};
54

65
pub type clock_t = i64;
@@ -1724,18 +1723,18 @@ pub const PF_MASKPROC: u32 = 0xf0000000;
17241723

17251724
// sys/ioccom.h
17261725
pub const fn IOCPARM_LEN(x: u32) -> u32 {
1727-
(x >> 16) & IOCPARM_MASK
1726+
(x >> 16) & crate::IOCPARM_MASK
17281727
}
17291728

17301729
pub const fn IOCBASECMD(x: u32) -> u32 {
1731-
x & (!(IOCPARM_MASK << 16))
1730+
x & (!(crate::IOCPARM_MASK << 16))
17321731
}
17331732

17341733
pub const fn IOCGROUP(x: u32) -> u32 {
17351734
(x >> 8) & 0xff
17361735
}
17371736
pub const fn _IOC(inout: u32, group: u32, num: u32, len: u32) -> u32 {
1738-
(inout) | (((len) & IOCPARM_MASK) << 16) | ((group) << 8) | (num)
1737+
(inout) | (((len) & crate::IOCPARM_MASK) << 16) | ((group) << 8) | (num)
17391738
}
17401739

17411740

0 commit comments

Comments
 (0)