From a1e3fddf9e891c239b53efd6a393381932dec2ca Mon Sep 17 00:00:00 2001 From: leo9001 Date: Thu, 4 Sep 2025 11:19:21 +0800 Subject: [PATCH] fix multi platform code style for netstack Signed-off-by: leo9001 --- .../napi/websocket/websocket_module/src/websocket_client.cpp | 4 ++-- interfaces/innerkits/websocket_native/libwebsocket_native.map | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/frameworks/js/napi/websocket/websocket_module/src/websocket_client.cpp b/frameworks/js/napi/websocket/websocket_module/src/websocket_client.cpp index ca9b52d0b..a7760948b 100644 --- a/frameworks/js/napi/websocket/websocket_module/src/websocket_client.cpp +++ b/frameworks/js/napi/websocket/websocket_module/src/websocket_client.cpp @@ -794,7 +794,7 @@ int WebSocketClient::ConnectEx(std::string url, struct OpenOptions options) int WebSocketClient::SendEx(char *data, size_t length) { - NETSTACK_LOGI("WebSocketClient::SendEx start %{public}s, %{public}d", data, length); + NETSTACK_LOGI("WebSocketClient::SendEx start %{public}s, %{public}zu", data, length); if (data == nullptr) { return WebSocketErrorCode::WEBSOCKET_SEND_DATA_NULL; } @@ -823,7 +823,7 @@ int WebSocketClient::SendEx(char *data, size_t length) } this->GetClientContext()->Push(dataCopy, length, protocol); this->GetClientContext()->TriggerWritable(); - NETSTACK_LOGI("WebSocketClient::Send end %{public}s, %{public}s, %{public}d", dataCopy, data, length); + NETSTACK_LOGI("WebSocketClient::Send end %{public}s, %{public}s, %{public}zu", dataCopy, data, length); return WebSocketErrorCode::WEBSOCKET_NONE_ERR; } diff --git a/interfaces/innerkits/websocket_native/libwebsocket_native.map b/interfaces/innerkits/websocket_native/libwebsocket_native.map index b2604e089..9d06ae0a0 100644 --- a/interfaces/innerkits/websocket_native/libwebsocket_native.map +++ b/interfaces/innerkits/websocket_native/libwebsocket_native.map @@ -20,10 +20,13 @@ "OHOS::NetStack::WebSocketClient::WebSocketClient::ConnectEx(std::__h::basic_string, std::__h::allocator>, OHOS::NetStack::WebSocketClient::OpenOptions)"; "OHOS::NetStack::WebSocketClient::WebSocketClient::GetClientContext() const"; "OHOS::NetStack::WebSocketClient::WebSocketClient::Send(char*, unsigned int)"; + "OHOS::NetStack::WebSocketClient::WebSocketClient::Send(char*, unsigned long)"; "OHOS::NetStack::WebSocketClient::WebSocketClient::SendEx(char*, unsigned int)"; + "OHOS::NetStack::WebSocketClient::WebSocketClient::SendEx(char*, unsigned long)"; "OHOS::NetStack::WebSocketClient::WebSocketClient::Close(OHOS::NetStack::WebSocketClient::CloseOption)"; "OHOS::NetStack::WebSocketClient::WebSocketClient::CloseEx(OHOS::NetStack::WebSocketClient::CloseOption)"; "OHOS::NetStack::WebSocketClient::WebSocketClient::Registcallback(void (*)(OHOS::NetStack::WebSocketClient::WebSocketClient*, OHOS::NetStack::WebSocketClient::OpenResult), void (*)(OHOS::NetStack::WebSocketClient::WebSocketClient*, std::__h::basic_string, std::__h::allocator> const&, unsigned int), void (*)(OHOS::NetStack::WebSocketClient::WebSocketClient*, OHOS::NetStack::WebSocketClient::ErrorResult), void (*)(OHOS::NetStack::WebSocketClient::WebSocketClient*, OHOS::NetStack::WebSocketClient::CloseResult))"; + "OHOS::NetStack::WebSocketClient::WebSocketClient::Registcallback(void (*)(OHOS::NetStack::WebSocketClient::WebSocketClient*, OHOS::NetStack::WebSocketClient::OpenResult), void (*)(OHOS::NetStack::WebSocketClient::WebSocketClient*, std::__h::basic_string, std::__h::allocator> const&, unsigned long), void (*)(OHOS::NetStack::WebSocketClient::WebSocketClient*, OHOS::NetStack::WebSocketClient::ErrorResult), void (*)(OHOS::NetStack::WebSocketClient::WebSocketClient*, OHOS::NetStack::WebSocketClient::CloseResult))"; "OHOS::NetStack::WebSocketClient::WebSocketClient::Destroy()"; "OHOS::NetStack::WebSocketServer::WebSocketServer::WebSocketServer()"; "OHOS::NetStack::WebSocketServer::WebSocketServer::~WebSocketServer()"; -- Gitee