From 22b21401f9ed3db3f7b0995e36fcfdf9c5a81771 Mon Sep 17 00:00:00 2001 From: stjet <49297268+stjet@users.noreply.github.com> Date: Thu, 13 Mar 2025 16:12:29 +0000 Subject: [PATCH] fix for potentially wrong int type --- Cargo.toml | 2 +- linux/src/fb.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 68d514d..fd28344 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ming-wm" -version = "1.0.0-beta.0" +version = "1.0.0-beta.1" repository = "https://github.com/stjet/ming-wm" license = "GPL-3.0-or-later" edition = "2021" diff --git a/linux/src/fb.rs b/linux/src/fb.rs index 35dbac2..e525111 100644 --- a/linux/src/fb.rs +++ b/linux/src/fb.rs @@ -7,8 +7,8 @@ use libc::{ ioctl, mmap, munmap, c_ulong, c_int }; //https://stackoverflow.com/a/75402838 //https://github.com/torvalds/linux/blob/master/include/uapi/linux/fb.h -pub const FBIOGET_VSCREENINFO: c_ulong = 0x4600; -pub const FBIOGET_FSCREENINFO: c_ulong = 0x4602; +const FBIOGET_VSCREENINFO: c_ulong = 0x4600; +const FBIOGET_FSCREENINFO: c_ulong = 0x4602; //https://www.kernel.org/doc/html/latest/fb/api.html @@ -108,7 +108,7 @@ impl Framebuffer { fn get_vscreeninfo(raw_fd: c_int) -> Result { let mut vi: FB_VAR_SCREENINFO = Default::default(); let result = unsafe { - ioctl(raw_fd, FBIOGET_VSCREENINFO, &mut vi) + ioctl(raw_fd, FBIOGET_VSCREENINFO.try_into().unwrap(), &mut vi) }; if result != -1 { Ok(vi) @@ -120,7 +120,7 @@ impl Framebuffer { fn get_fscreeninfo(raw_fd: c_int) -> Result { let mut fi: FB_FIX_SCREENINFO = Default::default(); let result = unsafe { - ioctl(raw_fd, FBIOGET_FSCREENINFO, &mut fi) + ioctl(raw_fd, FBIOGET_FSCREENINFO.try_into().unwrap(), &mut fi) }; if result != -1 { Ok(fi)