From 97179331df27360e0c8ac3d8d3c3eccc8a591eb0 Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Sun, 3 Jun 2018 17:25:40 +0200
Subject: [PATCH] Add more messages to event test & delete unused variable

---
 examples/event.rs | 8 ++++++--
 src/scheme.rs     | 4 +---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/examples/event.rs b/examples/event.rs
index 561976f101..93553557e5 100644
--- a/examples/event.rs
+++ b/examples/event.rs
@@ -22,8 +22,6 @@ fn dup(file: &File, buf: &str) -> io::Result<File> {
 fn main() -> io::Result<()> {
     let server = File::create("chan:hello_world")?;
 
-    println!("Testing events...");
-
     nonblock(&server)?;
 
     let mut event_file = File::open("event:")?;
@@ -56,6 +54,8 @@ fn main() -> io::Result<()> {
 
     let mut event = syscall::Event::default();
 
+    println!("Testing accept events...");
+
     event_file.read(&mut event)?;
     assert_eq!(event.data, TOKEN_TIMER);
     assert_eq!(event.flags, syscall::EVENT_READ);
@@ -73,6 +73,8 @@ fn main() -> io::Result<()> {
     assert_eq!(event.flags, syscall::EVENT_WRITE);
     println!("-> Accept event");
 
+    println!("Testing write events...");
+
     let mut stream = dup(&server, "listen")?;
 
     event_file.read(&mut event)?;
@@ -96,6 +98,8 @@ fn main() -> io::Result<()> {
     assert_eq!(event.flags, syscall::EVENT_READ);
     println!("-> Timed out");
 
+    println!("Testing read events...");
+
     client.write(b"a")?;
 
     let mut buf = [0; 5];
diff --git a/src/scheme.rs b/src/scheme.rs
index 75892ef826..8ab8a7b690 100644
--- a/src/scheme.rs
+++ b/src/scheme.rs
@@ -40,7 +40,6 @@ impl Default for Connection {
 #[derive(Debug, Default)]
 pub struct Handle {
     flags: usize,
-    fevent: usize,
     notified_read: bool,
     notified_write: bool,
 
@@ -198,9 +197,8 @@ impl SchemeBlockMut for IpcScheme {
             _ => Err(Error::new(EINVAL))
         }
     }
-    fn fevent(&mut self, id: usize, flags: usize) -> Result<Option<usize>> {
+    fn fevent(&mut self, id: usize, _flags: usize) -> Result<Option<usize>> {
         let handle = self.handles.get_mut(&id).ok_or(Error::new(EBADF))?;
-        handle.fevent = flags;
         handle.notified_read = false;
         handle.notified_write = false;
         Ok(Some(id))