From 8e2fc80ee0f3b38b3913f1efff2210bcc79cbcc3 Mon Sep 17 00:00:00 2001
From: Alex Zenla <alex@mycelium.engineering>
Date: Mon, 8 Jan 2024 14:16:33 -0800
Subject: [PATCH] use constant for error comparison

---
 xsd/examples/list.rs |  3 ++-
 xsd/src/bus.rs       |  5 +----
 xsd/src/sys.rs       | 38 +++++++++++++++++++-------------------
 3 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/xsd/examples/list.rs b/xsd/examples/list.rs
index 1810992..cec3ded 100644
--- a/xsd/examples/list.rs
+++ b/xsd/examples/list.rs
@@ -1,11 +1,12 @@
 use xsd::bus::XsdBusError;
 use xsd::client::XsdClient;
+use xsd::sys::XSD_ERROR_EINVAL;
 
 fn list_recursive(client: &mut XsdClient, level: usize, path: &str) -> Result<(), XsdBusError> {
     let children = match client.list(path) {
         Ok(children) => children,
         Err(error) => {
-            return if error.to_string() == "EINVAL" {
+            return if error.to_string() == XSD_ERROR_EINVAL.error {
                 Ok(())
             } else {
                 Err(error)
diff --git a/xsd/src/bus.rs b/xsd/src/bus.rs
index 866a6f1..d740d6f 100644
--- a/xsd/src/bus.rs
+++ b/xsd/src/bus.rs
@@ -139,10 +139,7 @@ impl XsdSocket {
             let error = CString::from_vec_with_nul(payload)?;
             return Err(XsdBusError::new(error.to_str()?));
         }
-        let response = XsdResponse {
-            header,
-            payload,
-        };
+        let response = XsdResponse { header, payload };
         Ok(response)
     }
 
diff --git a/xsd/src/sys.rs b/xsd/src/sys.rs
index 1959de9..526a45b 100644
--- a/xsd/src/sys.rs
+++ b/xsd/src/sys.rs
@@ -42,72 +42,72 @@ pub const XSD_WRITE_CREATE: &str = "CREATE";
 pub const XSD_WRITE_CREATE_EXCL: &str = "CREATE|EXCL";
 
 #[repr(C)]
-pub struct XsError<'a> {
-    num: i32,
-    error: &'a str,
+pub struct XsdError<'a> {
+    pub num: i32,
+    pub error: &'a str,
 }
 
-pub const XSD_ERROR_EINVAL: XsError = XsError {
+pub const XSD_ERROR_EINVAL: XsdError = XsdError {
     num: libc::EINVAL,
     error: "EINVAL",
 };
-pub const XSD_ERROR_EACCES: XsError = XsError {
+pub const XSD_ERROR_EACCES: XsdError = XsdError {
     num: libc::EACCES,
     error: "EACCES",
 };
-pub const XSD_ERROR_EEXIST: XsError = XsError {
+pub const XSD_ERROR_EEXIST: XsdError = XsdError {
     num: libc::EEXIST,
     error: "EEXIST",
 };
-pub const XSD_ERROR_EISDIR: XsError = XsError {
+pub const XSD_ERROR_EISDIR: XsdError = XsdError {
     num: libc::EISDIR,
     error: "EISDIR",
 };
-pub const XSD_ERROR_ENOENT: XsError = XsError {
+pub const XSD_ERROR_ENOENT: XsdError = XsdError {
     num: libc::ENOENT,
     error: "ENOENT",
 };
-pub const XSD_ERROR_ENOMEM: XsError = XsError {
+pub const XSD_ERROR_ENOMEM: XsdError = XsdError {
     num: libc::ENOMEM,
     error: "ENOMEM",
 };
-pub const XSD_ERROR_ENOSPC: XsError = XsError {
+pub const XSD_ERROR_ENOSPC: XsdError = XsdError {
     num: libc::ENOSPC,
     error: "ENOSPC",
 };
-pub const XSD_ERROR_EIO: XsError = XsError {
+pub const XSD_ERROR_EIO: XsdError = XsdError {
     num: libc::EIO,
     error: "EIO",
 };
-pub const XSD_ERROR_ENOTEMPTY: XsError = XsError {
+pub const XSD_ERROR_ENOTEMPTY: XsdError = XsdError {
     num: libc::ENOTEMPTY,
     error: "ENOTEMPTY",
 };
-pub const XSD_ERROR_ENOSYS: XsError = XsError {
+pub const XSD_ERROR_ENOSYS: XsdError = XsdError {
     num: libc::ENOSYS,
     error: "ENOSYS",
 };
-pub const XSD_ERROR_EROFS: XsError = XsError {
+pub const XSD_ERROR_EROFS: XsdError = XsdError {
     num: libc::EROFS,
     error: "EROFS",
 };
-pub const XSD_ERROR_EBUSY: XsError = XsError {
+pub const XSD_ERROR_EBUSY: XsdError = XsdError {
     num: libc::EBUSY,
     error: "EBUSY",
 };
-pub const XSD_ERROR_EAGAIN: XsError = XsError {
+pub const XSD_ERROR_EAGAIN: XsdError = XsdError {
     num: libc::EAGAIN,
     error: "EAGAIN",
 };
-pub const XSD_ERROR_EISCONN: XsError = XsError {
+pub const XSD_ERROR_EISCONN: XsdError = XsdError {
     num: libc::EISCONN,
     error: "EISCONN",
 };
-pub const XSD_ERROR_E2BIG: XsError = XsError {
+pub const XSD_ERROR_E2BIG: XsdError = XsdError {
     num: libc::E2BIG,
     error: "E2BIG",
 };
-pub const XSD_ERROR_EPERM: XsError = XsError {
+pub const XSD_ERROR_EPERM: XsdError = XsdError {
     num: libc::EPERM,
     error: "EPERM",
 };