Improve errors

[netwatcher] / src / list_unix.rs

diff --git a/src/list_unix.rs b/src/list_unix.rs
index 45ffc6361769578945558a28b6a736463a2b77ce..4a491402282893e1b7043cd05ffa1a0e640f7d05 100644 (file)
--- a/src/list_unix.rs
+++ b/src/list_unix.rs
@@ -13,11 +13,12 @@ struct CandidateInterface {
 }
 
 pub(crate) fn list_interfaces() -> Result<List, Error> {
 }
 
 pub(crate) fn list_interfaces() -> Result<List, Error> {

-    let addrs = getifaddrs().map_err(|_| Error::Internal)?;
+    let addrs = getifaddrs().map_err(|e| Error::Getifaddrs(e.to_string()))?;

     let mut candidates = HashMap::new();
 
     for addr in addrs {
     let mut candidates = HashMap::new();
 
     for addr in addrs {

-        let index = if_nametoindex(addr.interface_name.as_str()).map_err(|_| Error::Internal)?;
+        let index = if_nametoindex(addr.interface_name.as_str())
+            .map_err(|e| Error::GetInterfaceName(e.to_string()))?;

         let candidate = candidates
             .entry(addr.interface_name.clone())
             .or_insert_with(|| CandidateInterface {
         let candidate = candidates
             .entry(addr.interface_name.clone())
             .or_insert_with(|| CandidateInterface {


@@ -62,11 +63,11 @@ pub(crate) fn list_interfaces() -> Result<List, Error> {
 
 fn format_mac(bytes: &[u8]) -> Result<String, Error> {
     let mut mac = String::with_capacity(bytes.len() * 3);
 
 fn format_mac(bytes: &[u8]) -> Result<String, Error> {
     let mut mac = String::with_capacity(bytes.len() * 3);

-    for i in 0..bytes.len() {
+    for (i, b) in bytes.iter().enumerate() {

         if i != 0 {
         if i != 0 {

-            write!(mac, ":").map_err(|_| Error::Internal)?;
+            write!(mac, ":").map_err(|_| Error::FormatMacAddress)?;

         }
         }

-        write!(mac, "{:02X}", bytes[i]).map_err(|_| Error::Internal)?;
+        write!(mac, "{:02X}", b).map_err(|_| Error::FormatMacAddress)?;

     }
     Ok(mac)
 }
     }
     Ok(mac)
 }