avahi!() macro

Signed-off-by: Walker Crouse <walker.crouse@coop.co.uk>

zeroconf/src/linux/entry_group.rs

@@ -1,6 +1,5 @@
 //! Rust friendly `AvahiEntryGroup` wrappers/helpers
 
-use super::avahi_util;
 use crate::Result;
 use avahi_sys::{
     avahi_entry_group_add_service, avahi_entry_group_commit, avahi_entry_group_free,
@@ -60,7 +59,7 @@ impl ManagedAvahiEntryGroup {
             port,
         }: AddServiceParams,
     ) -> Result<()> {
-        let err = unsafe {
+        avahi!(
             avahi_entry_group_add_service(
                 self.0,
                 interface,
@@ -72,24 +71,11 @@ impl ManagedAvahiEntryGroup {
                 host,
                 port,
                 ptr::null_mut() as *const c_char, // null terminated txt record list
-            )
+            ),
-        };
+            "could not register service"
+        )?;
 
-        if err < 0 {
+        avahi!(avahi_entry_group_commit(self.0), "could not commit service")
-            return Err(format!(
-                "could not register service: `{}`",
-                avahi_util::get_error(err)
-            )
-            .into());
-        }
-
-        let err = unsafe { avahi_entry_group_commit(self.0) };
-
-        if err < 0 {
-            Err(format!("could not commit service: `{}`", avahi_util::get_error(err)).into())
-        } else {
-            Ok(())
-        }
     }
 
     /// Delegate function for [`avahi_entry_group_reset()`].

zeroconf/src/linux/poll.rs

@@ -1,6 +1,5 @@
 //! Rust friendly `AvahiSimplePoll` wrappers/helpers
 
-use super::avahi_util;
 use crate::Result;
 use avahi_sys::{
     avahi_simple_poll_free, avahi_simple_poll_iterate, avahi_simple_poll_loop,
@@ -30,16 +29,10 @@ impl ManagedAvahiSimplePoll {
     ///
     /// [`avahi_simple_poll_loop()`]: https://avahi.org/doxygen/html/simple-watch_8h.html#a14b4cb29832e8c3de609d4c4e5611985
     pub fn start_loop(&self) -> Result<()> {
-        let err = unsafe { avahi_simple_poll_loop(self.0) };
+        avahi!(
-        if err != 0 {
+            avahi_simple_poll_loop(self.0),
-            Err(format!(
+            "could not start AvahiSimplePoll"
-                "could not start AvahiSimplePoll: {}",
-                avahi_util::get_error(err)
         )
-            .into())
-        } else {
-            Ok(())
-        }
     }
 
     /// Delegate function for [`avahi_simple_poll_iterate()`].

zeroconf/src/linux/string_list.rs

@@ -128,6 +128,7 @@ mod tests {
         let key1 = c_string!("foo");
         let value1 = c_string!("bar");
 
+        unsafe {
             list.add_pair(
                 key1.as_ptr() as *const c_char,
                 value1.as_ptr() as *const c_char,
@@ -156,6 +157,7 @@ mod tests {
             assert_eq!(pair2.key().as_str(), "hello");
             assert_eq!(pair2.value().as_str(), "world");
         }
+    }
 
     #[test]
     fn add_pair_replaces_success() {
@@ -165,6 +167,7 @@ mod tests {
         let key = c_string!("foo");
         let value = c_string!("bar");
 
+        unsafe {
             list.add_pair(
                 key.as_ptr() as *const c_char,
                 value.as_ptr() as *const c_char,
@@ -185,6 +188,7 @@ mod tests {
 
             assert_eq!(pair.value().as_str(), "baz");
         }
+    }
 
     #[test]
     fn length_success() {
@@ -194,6 +198,7 @@ mod tests {
         let key = c_string!("foo");
         let value = c_string!("bar");
 
+        unsafe {
             list.add_pair(
                 key.as_ptr() as *const c_char,
                 value.as_ptr() as *const c_char,
@@ -201,6 +206,7 @@ mod tests {
 
             assert_eq!(list.length(), 1);
         }
+    }
 
     #[test]
     fn to_string_success() {
@@ -210,6 +216,7 @@ mod tests {
         let key = c_string!("foo");
         let value = c_string!("bar");
 
+        unsafe {
             list.add_pair(
                 key.as_ptr() as *const c_char,
                 value.as_ptr() as *const c_char,
@@ -217,6 +224,7 @@ mod tests {
 
             assert_eq!(list.to_string().as_str(), "\"foo=bar\"");
         }
+    }
 
     #[test]
     fn equals_success() {
@@ -226,6 +234,7 @@ mod tests {
         let key = c_string!("foo");
         let value = c_string!("bar");
 
+        unsafe {
             list.add_pair(
                 key.as_ptr() as *const c_char,
                 value.as_ptr() as *const c_char,
@@ -233,4 +242,5 @@ mod tests {
 
             assert_eq!(list.clone(), list);
         }
+    }
 }

zeroconf/src/macros.rs

@@ -21,7 +21,26 @@ macro_rules! bonjour {
         if err != 0 {
             crate::Result::Err(format!("{}", format!("{} (code: {})", $msg, err)).into())
         } else {
-            Ok(())
+            crate::Result::Ok(())
+        }
+    }};
+}
+
+#[cfg(target_os = "linux")]
+macro_rules! avahi {
+    ($call:expr, $msg:expr) => {{
+        #[allow(unused_unsafe)]
+        let err = unsafe { $call };
+        if err < 0 {
+            crate::Result::Err(
+                format!(
+                    "{}",
+                    format!("{}: `{}`", $msg, crate::linux::avahi_util::get_error(err))
+                )
+                .into(),
+            )
+        } else {
+            crate::Result::Ok(())
         }
     }};
 }