Skip to content

Commit b62795f

Browse files
committed
fix type convert.
1 parent 2d66ae8 commit b62795f

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

libwebrtc/src/native/frame_cryptor.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ impl KeyProvider {
135135
let c_str = std::ffi::CString::new(participant_id).unwrap();
136136
sys::lkKeyProviderSetKey(
137137
self.ffi.as_ptr(),
138-
c_str.as_ptr() as *const i8,
138+
c_str.as_ptr() as *const ::std::os::raw::c_char,
139139
key_index,
140140
key.as_ptr(),
141141
key.len().try_into().unwrap(),
@@ -148,7 +148,7 @@ impl KeyProvider {
148148
let c_str = std::ffi::CString::new(participant_id).unwrap();
149149
let key = sys::lkKeyProviderRatchetKey(
150150
self.ffi.as_ptr(),
151-
c_str.as_ptr() as *const i8,
151+
c_str.as_ptr() as *const ::std::os::raw::c_char,
152152
key_index,
153153
);
154154
if key.is_null() {
@@ -164,7 +164,7 @@ impl KeyProvider {
164164
unsafe {
165165
let c_str = std::ffi::CString::new(participant_id).unwrap();
166166
let key =
167-
sys::lkKeyProviderGetKey(self.ffi.as_ptr(), c_str.as_ptr() as *const i8, key_index);
167+
sys::lkKeyProviderGetKey(self.ffi.as_ptr(), c_str.as_ptr() as *const ::std::os::raw::c_char, key_index);
168168
if key.is_null() {
169169
None
170170
} else {
@@ -217,7 +217,7 @@ impl FrameCryptor {
217217
let c_str = std::ffi::CString::new(participant_id).unwrap();
218218
let ffi = sys::lkNewFrameCryptorForRtpSender(
219219
peer_factory.ffi.as_ptr(),
220-
c_str.as_ptr() as *const i8,
220+
c_str.as_ptr() as *const ::std::os::raw::c_char,
221221
algorithm.into(),
222222
key_provider.ffi.as_ptr(),
223223
sender.ffi.as_ptr(),
@@ -242,7 +242,7 @@ impl FrameCryptor {
242242
let c_str = std::ffi::CString::new(participant_id).unwrap();
243243
let ffi = sys::lkNewFrameCryptorForRtpReceiver(
244244
peer_factory.ffi.as_ptr(),
245-
c_str.as_ptr() as *const i8,
245+
c_str.as_ptr() as *const ::std::os::raw::c_char,
246246
algorithm.into(),
247247
key_provider.ffi.as_ptr(),
248248
receiver.ffi.as_ptr(),
@@ -311,9 +311,9 @@ impl DataPacketCryptor {
311311
let mut rtc_err = sys::lkRtcError { message: std::ptr::null() };
312312
let encrypted_packet = sys::lkDataPacketCryptorEncrypt(
313313
self.ffi.as_ptr(),
314-
c_str.as_ptr() as *const i8,
314+
c_str.as_ptr() as *const ::std::os::raw::c_char,
315315
key_index,
316-
data_vec.as_ptr() as *const i8,
316+
data_vec.as_ptr() as *const ::std::os::raw::c_char,
317317
data_vec.len() as u32,
318318
&mut rtc_err, // Assuming the sixth argument is a mutable pointer, adjust as needed
319319
);
@@ -355,7 +355,7 @@ impl DataPacketCryptor {
355355
let mut rtc_err = sys::lkRtcError { message: std::ptr::null() };
356356
let decrypted_data = sys::lkDataPacketCryptorDecrypt(
357357
self.ffi.as_ptr(),
358-
c_str.as_ptr() as *const i8,
358+
c_str.as_ptr() as *const ::std::os::raw::c_char,
359359
lk_encrypted_data,
360360
&mut rtc_err, // Assuming the eighth argument is a mutable pointer, adjust as needed
361361
);

libwebrtc/src/sys/conv.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ pub fn ice_servers_to_native(servers: &Vec<IceServer>) -> *mut sys::lkIceServer
3434
.collect();
3535
let ptr = url_ptrs.as_mut_ptr();
3636
std::mem::forget(url_ptrs); // Prevent deallocation
37-
ptr
37+
ptr as *mut *const ::std::os::raw::c_char
3838
},
3939
username: std::ffi::CString::new(s.username.clone()).unwrap().into_raw(),
4040
password: std::ffi::CString::new(s.password.clone()).unwrap().into_raw(),

libwebrtc/src/sys/utils.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ impl RefCountedString {
3434
unsafe {
3535
let len = sys::lkStringGetLength(self.ffi.as_ptr());
3636
let mut buf = vec![0u8; len as usize + 1];
37-
sys::lkStringGetData(self.ffi.as_ptr(), buf.as_mut_ptr() as *mut i8, len);
38-
let cstr = std::ffi::CStr::from_ptr(buf.as_ptr() as *const i8);
37+
sys::lkStringGetData(self.ffi.as_ptr(), buf.as_mut_ptr() as *mut ::std::os::raw::c_char, len);
38+
let cstr = std::ffi::CStr::from_ptr(buf.as_ptr() as *const ::std::os::raw::c_char);
3939
cstr.to_string_lossy().into_owned()
4040
}
4141
}

0 commit comments

Comments
 (0)