summary refs log tree commit diff
path: root/devices/src/utils/async_job_queue.rs
diff options
context:
space:
mode:
authorZach Reizner <zachr@google.com>2019-03-15 01:47:06 -0700
committerchrome-bot <chrome-bot@chromium.org>2019-03-18 07:05:10 -0700
commit7e622edd00393dbd018f6d20039f8abfa945a287 (patch)
treeb94981ce06b7bab3ad23ebd4572aa8c681ba1f3b /devices/src/utils/async_job_queue.rs
parenta6b9ca338879b502b33ec48ca82ec60dcaa170f9 (diff)
downloadcrosvm-7e622edd00393dbd018f6d20039f8abfa945a287.tar
crosvm-7e622edd00393dbd018f6d20039f8abfa945a287.tar.gz
crosvm-7e622edd00393dbd018f6d20039f8abfa945a287.tar.bz2
crosvm-7e622edd00393dbd018f6d20039f8abfa945a287.tar.lz
crosvm-7e622edd00393dbd018f6d20039f8abfa945a287.tar.xz
crosvm-7e622edd00393dbd018f6d20039f8abfa945a287.tar.zst
crosvm-7e622edd00393dbd018f6d20039f8abfa945a287.zip
usb: remove unused/abused fd argument from EventHandler::on_event
None of instances of EventHandler::on_event actually used the fd. The
PollfdChangeHandler::remove_poll_fd callback fabricated a potentially
valid fd (0), which went undetected because nobody used it.
Additionally, using RawFds almost always requires unsafe and should be
avoided.

CQ-DEPEND=CL:1522214
BUG=chromium:831850
TEST=cargo test

Change-Id: I095edbcad317e4832b1fb29fd08d602fbde4fd5d
Reviewed-on: https://chromium-review.googlesource.com/1525135
Commit-Ready: Jingkui Wang <jkwang@google.com>
Tested-by: Jingkui Wang <jkwang@google.com>
Reviewed-by: Jingkui Wang <jkwang@google.com>
Diffstat (limited to 'devices/src/utils/async_job_queue.rs')
-rw-r--r--devices/src/utils/async_job_queue.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/devices/src/utils/async_job_queue.rs b/devices/src/utils/async_job_queue.rs
index 223b96d..8f9f4a3 100644
--- a/devices/src/utils/async_job_queue.rs
+++ b/devices/src/utils/async_job_queue.rs
@@ -5,7 +5,6 @@
 use super::{Error, Result};
 use super::{EventHandler, EventLoop};
 use std::mem;
-use std::os::unix::io::RawFd;
 use std::sync::Arc;
 use sync::Mutex;
 use sys_util::{EventFd, WatchingEvents};
@@ -41,7 +40,7 @@ impl AsyncJobQueue {
 }
 
 impl EventHandler for AsyncJobQueue {
-    fn on_event(&self, _fd: RawFd) -> std::result::Result<(), ()> {
+    fn on_event(&self) -> std::result::Result<(), ()> {
         // We want to read out the event, but the value is not important.
         match self.evt.read() {
             Ok(_) => {}