andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-23 02:05:33 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Use AsFd to get rid of re-borrowing of zbus Power Key fd

Browse Source
This commit is contained in:
Markus Pettersson
2025-10-19 21:59:02 +02:00
committed by Ivan Molodetskikh
parent c8eea8ee9d
commit 137b87bbe5
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/niri.rs
+1 -4
View File
@@ -2777,8 +2777,6 @@ impl Niri {
#[cfg(feature = "dbus")] #[cfg(feature = "dbus")]
pub fn inhibit_power_key(&mut self) -> anyhow::Result<()> { pub fn inhibit_power_key(&mut self) -> anyhow::Result<()> {
use std::os::fd::{AsRawFd, BorrowedFd};
use smithay::reexports::rustix::io::{fcntl_setfd, FdFlags}; use smithay::reexports::rustix::io::{fcntl_setfd, FdFlags};
let conn = zbus::blocking::Connection::system()?; let conn = zbus::blocking::Connection::system()?;
@@ -2794,8 +2792,7 @@ impl Niri {
let fd: zbus::zvariant::OwnedFd = message.body().deserialize()?; let fd: zbus::zvariant::OwnedFd = message.body().deserialize()?;
// Don't leak the fd to child processes. // Don't leak the fd to child processes.
let borrowed = unsafe { BorrowedFd::borrow_raw(fd.as_raw_fd()) }; if let Err(err) = fcntl_setfd(&fd, FdFlags::CLOEXEC) {
if let Err(err) = fcntl_setfd(borrowed, FdFlags::CLOEXEC) {
warn!("error setting CLOEXEC on inhibit fd: {err:?}"); warn!("error setting CLOEXEC on inhibit fd: {err:?}");
}; };