Skip to content

Commit

Permalink
fix CI error on FreeBSD
Browse files Browse the repository at this point in the history
  • Loading branch information
SteveLauC committed Nov 11, 2022
1 parent c119cb3 commit facdcab
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 23 deletions.
4 changes: 2 additions & 2 deletions src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
Expand Up @@ -464,11 +464,11 @@ safe_f! {

f! {
pub fn major(dev: ::dev_t) -> ::c_int {
(((dev >> 32) & 0xffffff00) | ((dev >> 8) & 0xff))
(((dev >> 32) & 0xffffff00) | ((dev >> 8) & 0xff)) as ::c_int
}

pub fn minor(dev: ::dev_t) -> ::c_int {
(((dev >> 24) & 0xff00) | (dev & 0xffff00ff))
(((dev >> 24) & 0xff00) | (dev & 0xffff00ff)) as ::c_int
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
Expand Up @@ -483,11 +483,11 @@ safe_f! {

f! {
pub fn major(dev: ::dev_t) -> ::c_int {
(((dev >> 32) & 0xffffff00) | ((dev >> 8) & 0xff))
(((dev >> 32) & 0xffffff00) | ((dev >> 8) & 0xff)) as ::c_int
}

pub fn minor(dev: ::dev_t) -> ::c_int {
(((dev >> 24) & 0xff00) | (dev & 0xffff00ff))
(((dev >> 24) & 0xff00) | (dev & 0xffff00ff)) as ::c_int
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
Expand Up @@ -483,11 +483,11 @@ safe_f! {

f! {
pub fn major(dev: ::dev_t) -> ::c_int {
(((dev >> 32) & 0xffffff00) | ((dev >> 8) & 0xff))
(((dev >> 32) & 0xffffff00) | ((dev >> 8) & 0xff)) as ::c_int
}

pub fn minor(dev: ::dev_t) -> ::c_int {
(((dev >> 24) & 0xff00) | (dev & 0xffff00ff))
(((dev >> 24) & 0xff00) | (dev & 0xffff00ff)) as ::c_int
}
}

Expand Down
18 changes: 1 addition & 17 deletions src/unix/solarish/illumos.rs
Expand Up @@ -85,20 +85,4 @@ extern "C" {
pub fn pwritev(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int, offset: ::off_t)
-> ::ssize_t;
pub fn getpagesizes2(pagesize: *mut ::size_t, nelem: ::c_int) -> ::c_int;
}

f! {
pub fn major(device: ::dev_t) -> ::major_t {
((device >> 8) & 0xff) as ::major_t
}

pub fn minor(device: ::dev_t) -> ::minor_t {
(device & 0xffff00ff) as ::minor_t
}

pub fn makedev(maj: ::major_t, min: ::minor_t) -> ::dev_t {
let major = maj as ::dev_t;
let minor = min as ::dev_t;
(major << 8) | minor
}
}
}
14 changes: 14 additions & 0 deletions src/unix/solarish/mod.rs
Expand Up @@ -2652,6 +2652,20 @@ f! {
*slot = 0;
}
}

pub fn major(device: ::dev_t) -> ::major_t {
((device >> 8) & 0xff) as ::major_t
}

pub fn minor(device: ::dev_t) -> ::minor_t {
(device & 0xffff00ff) as ::minor_t
}

pub fn makedev(maj: ::major_t, min: ::minor_t) -> ::dev_t {
let major = maj as ::dev_t;
let minor = min as ::dev_t;
(major << 8) | minor
}
}

safe_f! {
Expand Down

0 comments on commit facdcab

Please sign in to comment.