fixed linter errors

Author: jimkring

src/ffi/multipart.rs

@@ -196,25 +196,23 @@ pub extern "C" fn multipart_form_add_bytes(
     let mut part = multipart::Part::bytes(data_vec);
 
     // Add filename if provided
-    if !filename.is_null() {
-        if let Ok(filename_str) = unsafe { CStr::from_ptr(filename).to_str() } {
-            if !filename_str.is_empty() {
-                part = part.file_name(filename_str.to_string());
-            }
-        }
+    if !filename.is_null()
+        && let Ok(filename_str) = unsafe { CStr::from_ptr(filename).to_str() }
+        && !filename_str.is_empty()
+    {
+        part = part.file_name(filename_str.to_string());
     }
 
     // Add MIME type if provided
-    if !mime_type.is_null() {
-        if let Ok(mime_str) = unsafe { CStr::from_ptr(mime_type).to_str() } {
-            if !mime_str.is_empty() {
-                match part.mime_str(mime_str) {
-                    Ok(p) => part = p,
-                    Err(e) => {
-                        wrapper.error_message = Some(format!("Invalid MIME type: {e}"));
-                        return false;
-                    }
-                }
+    if !mime_type.is_null()
+        && let Ok(mime_str) = unsafe { CStr::from_ptr(mime_type).to_str() }
+        && !mime_str.is_empty()
+    {
+        match part.mime_str(mime_str) {
+            Ok(p) => part = p,
+            Err(e) => {
+                wrapper.error_message = Some(format!("Invalid MIME type: {e}"));
+                return false;
             }
         }
     }

src/ffi/request.rs

@@ -261,30 +261,26 @@ pub extern "C" fn request_read_error_message(
 
     if let Some(progress_info) = tracker.get(&request_id) {
         let progress = progress_info.read().unwrap();
-        if let Some(ref response) = progress.final_response {
-            if let Err(ref error_msg) = response.body {
-                let msg_len = error_msg.len();
-                unsafe { *num_bytes = msg_len as u32 };
-
-                // Allocate memory for the string + null terminator
-                let c_str_ptr = unsafe { libc::malloc(msg_len + 1) as *mut c_char };
-                if c_str_ptr.is_null() {
-                    unsafe { *num_bytes = 0 };
-                    return ptr::null_mut();
-                }
+        if let Some(ref response) = progress.final_response
+            && let Err(ref error_msg) = response.body
+        {
+            let msg_len = error_msg.len();
+            unsafe { *num_bytes = msg_len as u32 };
 
-                // Copy the string and add null terminator
-                unsafe {
-                    std::ptr::copy_nonoverlapping(
-                        error_msg.as_ptr(),
-                        c_str_ptr as *mut u8,
-                        msg_len,
-                    );
-                    *(c_str_ptr.add(msg_len)) = 0;
-                }
+            // Allocate memory for the string + null terminator
+            let c_str_ptr = unsafe { libc::malloc(msg_len + 1) as *mut c_char };
+            if c_str_ptr.is_null() {
+                unsafe { *num_bytes = 0 };
+                return ptr::null_mut();
+            }
 
-                return c_str_ptr;
+            // Copy the string and add null terminator
+            unsafe {
+                std::ptr::copy_nonoverlapping(error_msg.as_ptr(), c_str_ptr as *mut u8, msg_len);
+                *(c_str_ptr.add(msg_len)) = 0;
             }
+
+            return c_str_ptr;
         }
     }
 
@@ -306,26 +302,26 @@ pub extern "C" fn request_read_error_url(
 
     if let Some(progress_info) = tracker.get(&request_id) {
         let progress = progress_info.read().unwrap();
-        if let Some(ref response) = progress.final_response {
-            if let Some(ref url) = response.error_url {
-                let url_len = url.len();
-                unsafe { *num_bytes = url_len as u32 };
-
-                // Allocate memory for the string + null terminator
-                let c_str_ptr = unsafe { libc::malloc(url_len + 1) as *mut c_char };
-                if c_str_ptr.is_null() {
-                    unsafe { *num_bytes = 0 };
-                    return ptr::null_mut();
-                }
+        if let Some(ref response) = progress.final_response
+            && let Some(ref url) = response.error_url
+        {
+            let url_len = url.len();
+            unsafe { *num_bytes = url_len as u32 };
 
-                // Copy the string and add null terminator
-                unsafe {
-                    std::ptr::copy_nonoverlapping(url.as_ptr(), c_str_ptr as *mut u8, url_len);
-                    *(c_str_ptr.add(url_len)) = 0;
-                }
+            // Allocate memory for the string + null terminator
+            let c_str_ptr = unsafe { libc::malloc(url_len + 1) as *mut c_char };
+            if c_str_ptr.is_null() {
+                unsafe { *num_bytes = 0 };
+                return ptr::null_mut();
+            }
 
-                return c_str_ptr;
+            // Copy the string and add null terminator
+            unsafe {
+                std::ptr::copy_nonoverlapping(url.as_ptr(), c_str_ptr as *mut u8, url_len);
+                *(c_str_ptr.add(url_len)) = 0;
             }
+
+            return c_str_ptr;
         }
     }
 
@@ -347,26 +343,26 @@ pub extern "C" fn request_read_error_source(
 
     if let Some(progress_info) = tracker.get(&request_id) {
         let progress = progress_info.read().unwrap();
-        if let Some(ref response) = progress.final_response {
-            if let Some(ref source) = response.error_source {
-                let src_len = source.len();
-                unsafe { *num_bytes = src_len as u32 };
-
-                // Allocate memory for the string + null terminator
-                let c_str_ptr = unsafe { libc::malloc(src_len + 1) as *mut c_char };
-                if c_str_ptr.is_null() {
-                    unsafe { *num_bytes = 0 };
-                    return ptr::null_mut();
-                }
+        if let Some(ref response) = progress.final_response
+            && let Some(ref source) = response.error_source
+        {
+            let src_len = source.len();
+            unsafe { *num_bytes = src_len as u32 };
 
-                // Copy the string and add null terminator
-                unsafe {
-                    std::ptr::copy_nonoverlapping(source.as_ptr(), c_str_ptr as *mut u8, src_len);
-                    *(c_str_ptr.add(src_len)) = 0;
-                }
+            // Allocate memory for the string + null terminator
+            let c_str_ptr = unsafe { libc::malloc(src_len + 1) as *mut c_char };
+            if c_str_ptr.is_null() {
+                unsafe { *num_bytes = 0 };
+                return ptr::null_mut();
+            }
 
-                return c_str_ptr;
+            // Copy the string and add null terminator
+            unsafe {
+                std::ptr::copy_nonoverlapping(source.as_ptr(), c_str_ptr as *mut u8, src_len);
+                *(c_str_ptr.add(src_len)) = 0;
             }
+
+            return c_str_ptr;
         }
     }