diff --git a/src/header/elf/mod.rs b/src/header/elf/mod.rs index c826ab47da61c037174646f0a939b196d6cc747e..db7b6d41f86b5af65e102897c50cad778ddfa9e3 100644 --- a/src/header/elf/mod.rs +++ b/src/header/elf/mod.rs @@ -273,20 +273,20 @@ pub const SHT_HIPROC: usize = 0x7fffffff; pub const SHT_LOUSER: usize = 0x80000000; pub const SHT_HIUSER: usize = 0x8fffffff; -pub const SHF_WRITE: usize = (1 << 0); -pub const SHF_ALLOC: usize = (1 << 1); -pub const SHF_EXECINSTR: usize = (1 << 2); -pub const SHF_MERGE: usize = (1 << 4); -pub const SHF_STRINGS: usize = (1 << 5); -pub const SHF_INFO_LINK: usize = (1 << 6); -pub const SHF_LINK_ORDER: usize = (1 << 7); -pub const SHF_OS_NONCONFORMING: usize = (1 << 8); -pub const SHF_GROUP: usize = (1 << 9); -pub const SHF_TLS: usize = (1 << 10); +pub const SHF_WRITE: usize = 1 << 0; +pub const SHF_ALLOC: usize = 1 << 1; +pub const SHF_EXECINSTR: usize = 1 << 2; +pub const SHF_MERGE: usize = 1 << 4; +pub const SHF_STRINGS: usize = 1 << 5; +pub const SHF_INFO_LINK: usize = 1 << 6; +pub const SHF_LINK_ORDER: usize = 1 << 7; +pub const SHF_OS_NONCONFORMING: usize = 1 << 8; +pub const SHF_GROUP: usize = 1 << 9; +pub const SHF_TLS: usize = 1 << 10; pub const SHF_MASKOS: usize = 0x0ff00000; pub const SHF_MASKPROC: usize = 0xf0000000; -pub const SHF_ORDERED: usize = (1 << 30); -pub const SHF_EXCLUDE: usize = (1 << 31); +pub const SHF_ORDERED: usize = 1 << 30; +pub const SHF_EXCLUDE: usize = 1 << 31; pub const GRP_COMDAT: usize = 0x1; #[repr(C)] @@ -432,9 +432,9 @@ pub const PT_HIOS: usize = 0x6fffffff; pub const PT_LOPROC: usize = 0x70000000; pub const PT_HIPROC: usize = 0x7fffffff; pub const PN_XNUM: usize = 0xffff; -pub const PF_X: usize = (1 << 0); -pub const PF_W: usize = (1 << 1); -pub const PF_R: usize = (1 << 2); +pub const PF_X: usize = 1 << 0; +pub const PF_W: usize = 1 << 1; +pub const PF_R: usize = 1 << 2; pub const PF_MASKOS: usize = 0x0ff00000; pub const PF_MASKPROC: usize = 0xf0000000; diff --git a/src/header/time/mod.rs b/src/header/time/mod.rs index 89eadd6a0fe14ad3c62d71d67b493ff3a11db9c6..5a2beb6bbd5509536ce12d9f49bdbd08175389a8 100644 --- a/src/header/time/mod.rs +++ b/src/header/time/mod.rs @@ -3,7 +3,7 @@ use core::convert::{TryFrom, TryInto}; use crate::{ - header::errno::{EIO, EOVERFLOW}, + header::errno::EOVERFLOW, platform::{self, types::*, Pal, Sys}, }; @@ -384,10 +384,10 @@ pub unsafe extern "C" fn mktime(t: *mut tm) -> time_t { day += MONTH_DAYS[leap][month as usize] as i64; } - (day * (60 * 60 * 24) + day * (60 * 60 * 24) + ((*t).tm_hour as i64) * (60 * 60) + ((*t).tm_min as i64) * 60 - + (*t).tm_sec as i64) + + (*t).tm_sec as i64 } }