From 721bc3c15d8f14a64c9145f262c8b2052de784b2 Mon Sep 17 00:00:00 2001
From: leo9001 <wanglong201@h-partners.com>
Date: Thu, 4 Sep 2025 11:19:21 +0800
Subject: [PATCH] fix multi platform code style for netstack

Signed-off-by: leo9001 <wanglong201@h-partners.com>
---
 .../napi/websocket/websocket_module/src/websocket_client.cpp  | 4 ++--
 interfaces/innerkits/websocket_native/libwebsocket_native.map | 3 +++
 interfaces/kits/c/net_websocket/BUILD.gn                      | 1 +
 3 files changed, 6 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<char, std::__h::char_traits<char>, std::__h::allocator<char>>, 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<char, std::__h::char_traits<char>, std::__h::allocator<char>> 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<char, std::__h::char_traits<char>, std::__h::allocator<char>> 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()";
diff --git a/interfaces/kits/c/net_websocket/BUILD.gn b/interfaces/kits/c/net_websocket/BUILD.gn
index 017529a02..35ce1ff78 100644
--- a/interfaces/kits/c/net_websocket/BUILD.gn
+++ b/interfaces/kits/c/net_websocket/BUILD.gn
@@ -38,6 +38,7 @@ ohos_shared_library("net_websocket") {
 
   deps = [
     "$NETSTACK_DIR/interfaces/innerkits/websocket_native:websocket_native",
+    "$NETSTACK_DIR/frameworks/js/napi/websocket:websocket",
     "$NETSTACK_DIR/utils/napi_utils:napi_utils",
   ]
 
-- 
Gitee