From dd216ee23eaee199165aac62902280d60265614c Mon Sep 17 00:00:00 2001 From: Benjamin Bara Date: Tue, 21 Feb 2023 07:05:44 +0100 Subject: [PATCH] utmpx: cast timeval fields to i64 --- src/uucore/src/lib/features/utmpx.rs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/uucore/src/lib/features/utmpx.rs b/src/uucore/src/lib/features/utmpx.rs index ee8744721..599a02778 100644 --- a/src/uucore/src/lib/features/utmpx.rs +++ b/src/uucore/src/lib/features/utmpx.rs @@ -192,13 +192,9 @@ impl Utmpx { } /// A.K.A. ut.ut_tv pub fn login_time(&self) -> time::OffsetDateTime { - #[cfg(all(not(target_os = "freebsd"), not(target_vendor = "apple")))] - let ts_nanos: i128 = (self.inner.ut_tv.tv_sec as i64 * 1_000_000_000_i64 - + self.inner.ut_tv.tv_usec as i64 * 1_000_i64) - .into(); - #[cfg(any(target_os = "freebsd", target_vendor = "apple"))] - let ts_nanos: i128 = (self.inner.ut_tv.tv_sec * 1_000_000_000_i64 - + self.inner.ut_tv.tv_usec as i64 * 1_000_i64) + #[allow(clippy::unnecessary_cast)] + let ts_nanos: i128 = (1_000_000_000_i64 * self.inner.ut_tv.tv_sec as i64 + + 1_000_i64 * self.inner.ut_tv.tv_usec as i64) .into(); let local_offset = time::OffsetDateTime::now_local().unwrap().offset(); time::OffsetDateTime::from_unix_timestamp_nanos(ts_nanos)