From 6d869a4283f558113b23eb42be9f5428d2d24472 Mon Sep 17 00:00:00 2001 From: baiwei Date: Thu, 21 Sep 2023 06:46:26 +0000 Subject: [PATCH 1/2] fix codecheck Signed-off-by: baiwei Change-Id: I6b2d095da54b7ba2e8af7e81c256ee27fbe94578 --- utils/ipc/include/stream_socket.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/utils/ipc/include/stream_socket.h b/utils/ipc/include/stream_socket.h index 9eee37fd..6cc36778 100644 --- a/utils/ipc/include/stream_socket.h +++ b/utils/ipc/include/stream_socket.h @@ -45,7 +45,8 @@ public: protected: #ifdef OHOS_BUILD_ENABLE_RUST struct RustDelete { - void operator() (RustStreamSocket* raw) { + void operator() (RustStreamSocket* raw) + { StreamSocketDelete(raw); } }; @@ -57,4 +58,4 @@ protected: }; } // namespace Sensors } // namespace OHOS -#endif // STREAM_SOCKET_H \ No newline at end of file +#endif // STREAM_SOCKET_H -- Gitee From 28e7a92812cc74903ddc13ccffdb9845933932b0 Mon Sep 17 00:00:00 2001 From: baiwei Date: Mon, 9 Oct 2023 02:23:37 +0000 Subject: [PATCH 2/2] fix debug Signed-off-by: baiwei Change-Id: Ib4df2369fbd9766f14f7fcdcc291568442bd5695 --- rust/utils/socket_ipc_rust_ffi/src/stream_buffer.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rust/utils/socket_ipc_rust_ffi/src/stream_buffer.rs b/rust/utils/socket_ipc_rust_ffi/src/stream_buffer.rs index b7ac6a3c..2b8d75a5 100644 --- a/rust/utils/socket_ipc_rust_ffi/src/stream_buffer.rs +++ b/rust/utils/socket_ipc_rust_ffi/src/stream_buffer.rs @@ -162,8 +162,8 @@ impl StreamBuffer { MAX_STREAM_BUF_SIZE - self.w_pos } } - fn get_error_status_remark(&self) -> *const c_char { - let s: &[c_char] = match self.rw_error_status { + fn get_error_status_remark(&self) -> *const u8 { + let s: &[u8] = match self.rw_error_status { ErrorStatus::Ok => b"OK\0", ErrorStatus::Read => b"READ_ERROR\0", ErrorStatus::Write => b"WRITE_ERROR\0", -- Gitee