Skip to content

Commit ead8b81

Browse files
committed
Net module: Clashing names after rebase
1 parent 06dbf3c commit ead8b81

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/rust/lib_ccxr/src/net/c_functions.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ pub fn connect_to_srv(
2424
}
2525

2626
/// Rust equivalent for `net_send_header` function in C. Uses Rust-native types as input and output.
27-
pub fn net_send_header(data: &[u8]) {
27+
pub fn net_send_header_rust(data: &[u8]) {
28+
// Rename back to `net_send_header` when C function is removed from encoder
2829
let mut send_target = TARGET.write().unwrap();
2930
send_target.as_mut().unwrap().send_header(data);
3031
}

src/rust/src/libccxr_exports/net.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pub unsafe extern "C" fn ccxr_connect_to_srv(
6565
#[no_mangle]
6666
pub unsafe extern "C" fn ccxr_net_send_header(data: *const c_uchar, len: usize) {
6767
let buffer = std::slice::from_raw_parts(data, len);
68-
net_send_header(buffer);
68+
net_send_header_rust(buffer);
6969
}
7070

7171
/// Rust equivalent for `net_send_cc` function in C. Uses C-native types as input and output.

0 commit comments

Comments
 (0)