remove AsCChars from linux; more clone_from replacements

Signed-off-by: Walker Crouse <[email protected]>
windy1 · Jul 26, 2024 · a3932bf · a3932bf
1 parent fd3dc5d
commit a3932bf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/zeroconf/src/avahi/browser.rs b/zeroconf/src/avahi/browser.rs
@@ -91,7 +91,7 @@ impl TMdnsBrowser for AvahiMdnsBrowser {
                 .build()?,
         )?));
 
-        self.context.client = self.client.clone();
+        self.context.client.clone_from(&self.client);
 
         unsafe {
             if let Err(e) = create_browser(&mut self.context) {

diff --git a/zeroconf/src/avahi/service.rs b/zeroconf/src/avahi/service.rs
@@ -127,7 +127,7 @@ impl TMdnsService for AvahiMdnsService {
                 .build()?,
         )?));
 
-        self.context.client = self.client.clone();
+        self.context.client.clone_from(&self.client);
 
         unsafe {
             if let Err(e) = create_service(&mut self.context) {

diff --git a/zeroconf/src/ffi/c_str.rs b/zeroconf/src/ffi/c_str.rs
@@ -4,11 +4,13 @@ use libc::c_char;
 use std::ffi::{CStr, CString};
 
 /// Helper trait to map to `Option<*const c_char>`.
+#[cfg(not(target_os = "linux"))]
 pub trait AsCChars {
     /// Maps the type to a `Option<*const c_char>`.
     fn as_c_chars(&self) -> Option<*const c_char>;
 }
 
+#[cfg(not(target_os = "linux"))]
 impl AsCChars for Option<&CString> {
     fn as_c_chars(&self) -> Option<*const c_char> {
         self.map(|s| s.as_ptr() as *const c_char)