Always use std::ffi::c_char for a c_char type

4 files changed, 11 insertions, 13 deletions

diff --git a/mullvad-daemon/src/exception_logging/win.rs b/mullvad-daemon/src/exception_logging/win.rs
index ff2201029e..906a8533fc 100644
--- a/mullvad-daemon/src/exception_logging/win.rs
+++ b/mullvad-daemon/src/exception_logging/win.rs
@@ -1,10 +1,10 @@
 use mullvad_paths::log_dir;
 use std::{
     borrow::Cow,
-    ffi::{c_void, CStr},
+    ffi::{c_char, c_void, CStr},
     fmt::Write,
     fs, io, mem,
-    os::{raw::c_char, windows::io::AsRawHandle},
+    os::windows::io::AsRawHandle,
     path::{Path, PathBuf},
     ptr,
 };
diff --git a/talpid-core/src/firewall/windows.rs b/talpid-core/src/firewall/windows.rs
index 807308722d..ed3e0a19fe 100644
--- a/talpid-core/src/firewall/windows.rs
+++ b/talpid-core/src/firewall/windows.rs
@@ -334,7 +334,7 @@ fn widestring_ip(ip: IpAddr) -> WideCString {
 /// Logging callback implementation.
 pub extern "system" fn log_sink(
     level: log::Level,
-    msg: *const libc::c_char,
+    msg: *const std::ffi::c_char,
     context: *mut std::ffi::c_void,
 ) {
     if msg.is_null() {
@@ -409,11 +409,10 @@ fn multibyte_to_wide(mb_string: &CStr, codepage: u32) -> Result<Vec<u16>, io::Er
 #[allow(non_snake_case)]
 mod winfw {
     use super::{widestring_ip, AllowedEndpoint, AllowedTunnelTraffic, Error, WideCString};
-    use std::ffi::c_void;
+    use std::ffi::{c_char, c_void};
     use talpid_types::net::TransportProtocol;
 
-    type LogSink =
-        extern "system" fn(level: log::Level, msg: *const libc::c_char, context: *mut c_void);
+    type LogSink = extern "system" fn(level: log::Level, msg: *const c_char, context: *mut c_void);
 
     pub struct WinFwAllowedEndpointContainer {
         _clients: Box<[WideCString]>,
diff --git a/talpid-wireguard/src/logging.rs b/talpid-wireguard/src/logging.rs
index f8536b08a6..5f006d418c 100644
--- a/talpid-wireguard/src/logging.rs
+++ b/talpid-wireguard/src/logging.rs
@@ -1,6 +1,6 @@
 use once_cell::sync::Lazy;
 use parking_lot::Mutex;
-use std::ffi::c_void;
+use std::ffi::{c_char, c_void};
 use std::{collections::HashMap, fmt, fs, io::Write, path::Path};
 
 static LOG_MUTEX: Lazy<Mutex<HashMap<u32, fs::File>>> = Lazy::new(|| Mutex::new(HashMap::new()));
@@ -92,7 +92,7 @@ fn log_inner(logfile: &mut fs::File, level: LogLevel, tag: &str, msg: &str) {
 // Callback that receives messages from WireGuard
 pub unsafe extern "system" fn wg_go_logging_callback(
     level: WgLogLevel,
-    msg: *const libc::c_char,
+    msg: *const c_char,
     context: *mut c_void,
 ) {
     let mut map = LOG_MUTEX.lock();
diff --git a/talpid-wireguard/src/wireguard_go.rs b/talpid-wireguard/src/wireguard_go.rs
index 270161c993..fff8416064 100644
--- a/talpid-wireguard/src/wireguard_go.rs
+++ b/talpid-wireguard/src/wireguard_go.rs
@@ -6,9 +6,8 @@ use crate::logging::{clean_up_logging, initialize_logging, wg_go_logging_callbac
 #[cfg(windows)]
 use futures::SinkExt;
 use std::{
-    ffi::{c_void, CStr},
+    ffi::{c_char, c_void, CStr},
     future::Future,
-    os::raw::c_char,
     path::Path,
     pin::Pin,
 };
@@ -425,7 +424,7 @@ fn check_wg_status(wg_code: i32) -> Result<()> {
 pub type Fd = std::os::unix::io::RawFd;
 
 pub type LoggingCallback =
-    unsafe extern "system" fn(level: WgLogLevel, msg: *const libc::c_char, context: *mut c_void);
+    unsafe extern "system" fn(level: WgLogLevel, msg: *const c_char, context: *mut c_void);
 
 const ERROR_GENERAL_FAILURE: i32 = -1;
 const ERROR_INTERMITTENT_FAILURE: i32 = -2;
@@ -460,7 +459,7 @@ extern "C" {
         iface_name: *const i8,
         mtu: i64,
         settings: *const i8,
-        iface_name_out: *mut *mut std::os::raw::c_char,
+        iface_name_out: *mut *mut c_char,
         iface_luid_out: *mut u64,
         logging_callback: Option<LoggingCallback>,
         logging_context: *mut c_void,
@@ -470,7 +469,7 @@ extern "C" {
     fn wgTurnOff(handle: i32) -> i32;
 
     // Returns the file descriptor of the tunnel IPv4 socket.
-    fn wgGetConfig(handle: i32) -> *mut std::os::raw::c_char;
+    fn wgGetConfig(handle: i32) -> *mut c_char;
 
     // Sets the config of the WireGuard interface.
     fn wgSetConfig(handle: i32, settings: *const i8) -> i32;