Error handler for soundmodem components

[m17rt] / m17app / src / tnc.rs

diff --git a/m17app/src/tnc.rs b/m17app/src/tnc.rs
index e7799b4843cb713fd819e1390110dc8a9030b81c..ef30e38f0d325bd360cc2ddd301226e08f53b65e 100644 (file)
--- a/m17app/src/tnc.rs
+++ b/m17app/src/tnc.rs
@@ -17,10 +17,10 @@ pub trait Tnc: Read + Write + Sized + Send + 'static {
     fn try_clone(&mut self) -> Result<Self, TncError>;
 
     /// Start I/O.
     fn try_clone(&mut self) -> Result<Self, TncError>;
 
     /// Start I/O.

-    fn start(&mut self) -> Result<(), TncError>;
+    fn start(&mut self);

 
     /// Shut down I/O - it is assumed we cannot restart.
 
     /// Shut down I/O - it is assumed we cannot restart.

-    fn close(&mut self) -> Result<(), TncError>;
+    fn close(&mut self);

 }
 
 #[derive(Debug, PartialEq, Eq, Clone)]
 }
 
 #[derive(Debug, PartialEq, Eq, Clone)]


@@ -34,13 +34,11 @@ impl Tnc for std::net::TcpStream {
         std::net::TcpStream::try_clone(self).map_err(|_| TncError::Unknown)
     }
 
         std::net::TcpStream::try_clone(self).map_err(|_| TncError::Unknown)
     }
 

-    fn start(&mut self) -> Result<(), TncError> {
+    fn start(&mut self) {

         // already started, hopefully we get onto reading the socket quickly
         // already started, hopefully we get onto reading the socket quickly

-        Ok(())

     }
 
     }
 

-    fn close(&mut self) -> Result<(), TncError> {
-        self.shutdown(std::net::Shutdown::Both)
-            .map_err(|_| TncError::Unknown)
+    fn close(&mut self) {
+        let _ = self.shutdown(std::net::Shutdown::Both);

     }
 }
     }
 }