From 41df89413495d118226a3632d701f759bb64f006 Mon Sep 17 00:00:00 2001 From: Wuhongbo Date: Thu, 25 Jan 2024 20:48:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=91=8A=E8=AD=A6=E6=B8=85?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Wuhongbo --- wifi/base/cRPC/src/context.c | 30 +++++++++---------- wifi/base/cRPC/src/serial.c | 2 +- .../native/src/wifi_device_proxy.cpp | 22 +++++++------- .../native/src/wifi_hotspot_proxy.cpp | 2 +- wifi/frameworks/native/src/wifi_p2p_proxy.cpp | 2 +- .../frameworks/native/src/wifi_scan_proxy.cpp | 4 +-- .../ipc_framework/cRPC/src/context.c | 6 ++-- .../ipc_framework/cRPC/src/hash_table.c | 8 ++--- .../ipc_framework/cRPC/src/serial.c | 18 +++++------ .../ipc_framework/cRPC/src/server.c | 10 +++---- .../wifi_ap_sa/wifi_hotspot_stub.cpp | 8 ++--- .../wifi_p2p_sa/wifi_p2p_callback_proxy.cpp | 4 +-- .../wifi_p2p_sa/wifi_p2p_service_impl.cpp | 6 ++-- .../wifi_manage/wifi_p2p_sa/wifi_p2p_stub.cpp | 6 ++-- .../wifi_scan_sa/wifi_scan_stub.cpp | 2 +- .../wifi_sta_sa/wifi_device_service_impl.cpp | 4 +-- .../wifi_sta_sa/wifi_device_stub.cpp | 4 +-- .../wifi_standard/wifi_hal/wifi_hal_adapter.c | 2 +- .../wifi_hal/wifi_hal_crpc_common.c | 2 +- .../hostapd_hal/wifi_hostapd_hal.c | 2 +- .../wpa_p2p_hal/wifi_p2p_hal.c | 2 +- .../wpa_sta_hal/wifi_common_hal.c | 2 +- .../wpa_sta_hal/wifi_supplicant_hal.c | 4 +-- 23 files changed, 76 insertions(+), 76 deletions(-) diff --git a/wifi/base/cRPC/src/context.c b/wifi/base/cRPC/src/context.c index 50f33a872..b7afdc303 100644 --- a/wifi/base/cRPC/src/context.c +++ b/wifi/base/cRPC/src/context.c @@ -32,8 +32,8 @@ Context *CreateContext(int capacity) if (context == NULL) { return NULL; } - context->rCapacity = capacity; - context->wCapacity = capacity; + context->rCapacity = (uint32_t)capacity; + context->wCapacity = (uint32_t)capacity; context->szRead = (char *)calloc(capacity, sizeof(char)); if (context->szRead == NULL) { free(context); @@ -76,10 +76,10 @@ static int ExpandReadCache(Context *context, int len) return -1; } - int left = (context->rBegin <= context->rEnd) ? (context->rCapacity - 1 - context->rEnd + context->rBegin) - : (context->rBegin - context->rEnd - 1); + int left = (int)((context->rBegin <= context->rEnd) ? (context->rCapacity - 1 - context->rEnd + context->rBegin) + : (context->rBegin - context->rEnd - 1)); if (left < len) { - int capacity = context->rCapacity; + uint32_t capacity = context->rCapacity; while (left < len) { capacity += context->rCapacity; left += context->rCapacity; @@ -117,13 +117,13 @@ static int ExpandWriteCache(Context *context, int len) return -1; } - int left = (context->wBegin <= context->wEnd) ? (context->wCapacity - 1 - context->wEnd + context->wBegin) - : (context->wBegin - context->wEnd - 1); + int left = (int)((context->wBegin <= context->wEnd) ? (context->wCapacity - 1 - context->wEnd + context->wBegin) + : (context->wBegin - context->wEnd - 1)); if (left < len) { - int capacity = context->wCapacity; + uint32_t capacity = context->wCapacity; while (left < len) { capacity += context->wCapacity; - left += context->wCapacity; + left += (int)context->wCapacity; } char *p = (char *)calloc(capacity, sizeof(char)); if (p == NULL) { @@ -172,14 +172,14 @@ static int ContextAppendRead(Context *context, const char *buf, int len) } context->rEnd += len; } else { - int tmp = context->rCapacity - context->rEnd; + int tmp = (int)(context->rCapacity - context->rEnd); if (tmp > 0 && memmove_s(context->szRead + context->rEnd, tmp, buf, tmp) != EOK) { return -1; } if (tmp < len && memmove_s(context->szRead, len - tmp, buf + tmp, len - tmp) != EOK) { return -1; } - context->rEnd = len - tmp; + context->rEnd = (uint32_t)(len - tmp); } return 0; } @@ -199,7 +199,7 @@ int ContextAppendWrite(Context *context, const char *buf, int len) } context->wEnd += len; } else { - int tmp = context->wCapacity - context->wEnd; + int tmp = (int)(context->wCapacity - context->wEnd); if (tmp > 0 && memmove_s(context->szWrite + context->wEnd, tmp, buf, tmp) != EOK) { return -1; } @@ -249,7 +249,7 @@ char *ContextGetReadRecord(Context *context) return NULL; } *p = 0; - int num = p - buf + strlen(context->cMsgEnd); + uint32_t num = p - buf + strlen(context->cMsgEnd); context->rBegin += num; if (context->rBegin >= context->rCapacity) { context->rBegin -= context->rCapacity; @@ -291,7 +291,7 @@ int ContextWriteNet(Context *context) } return ret; } - int len = context->wCapacity - context->wBegin; + int len = (int)(context->wCapacity - context->wBegin); int ret = MyWrite(context->fd, context->szWrite + context->wBegin, len); if (ret < 0) { return ret; @@ -303,7 +303,7 @@ int ContextWriteNet(Context *context) context->wBegin = 0; ret = MyWrite(context->fd, context->szWrite, context->wEnd); if (ret > 0) { - context->wBegin = ret; + context->wBegin = (uint32_t)ret; } return ret; } diff --git a/wifi/base/cRPC/src/serial.c b/wifi/base/cRPC/src/serial.c index 91d9769f5..e28d725d9 100644 --- a/wifi/base/cRPC/src/serial.c +++ b/wifi/base/cRPC/src/serial.c @@ -227,7 +227,7 @@ int ReadFunc(Context *context, char *funcName, int count) if (strncpy_s(funcName, count, context->oneProcess + context->nPos, len) != EOK) { return -1; } - context->nPos += len + 1; + context->nPos += (uint32_t)(len + 1); return 0; } diff --git a/wifi/frameworks/native/src/wifi_device_proxy.cpp b/wifi/frameworks/native/src/wifi_device_proxy.cpp index 5f0980464..eb810fbec 100644 --- a/wifi/frameworks/native/src/wifi_device_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_device_proxy.cpp @@ -271,7 +271,7 @@ void WifiDeviceProxy::WriteIpAddress(MessageParcel &data, const WifiIpAddress &a { data.WriteInt32(address.family); data.WriteInt32(address.addressIpv4); - int size = address.addressIpv6.size(); + int size = (int)address.addressIpv6.size(); data.WriteInt32(size); for (int i = 0; i < size; i++) { data.WriteInt8(address.addressIpv6[i]); @@ -523,7 +523,7 @@ ErrCode WifiDeviceProxy::RemoveAllDevice() void WifiDeviceProxy::ReadIpAddress(MessageParcel &reply, WifiIpAddress &address) { constexpr int MAX_SIZE = 256; - address.family = reply.ReadInt32(); + address.family = (uint32_t)reply.ReadInt32(); address.addressIpv4 = reply.ReadInt32(); int size = reply.ReadInt32(); if (size > MAX_SIZE) { @@ -991,7 +991,7 @@ void WifiDeviceProxy::ReadLinkedInfo(MessageParcel &reply, WifiLinkedInfo &info) info.linkSpeed = reply.ReadInt32(); info.macAddress = reply.ReadString(); info.macType = reply.ReadInt32(); - info.ipAddress = reply.ReadInt32(); + info.ipAddress = (uint32_t)reply.ReadInt32(); int tmpConnState = reply.ReadInt32(); if ((tmpConnState >= 0) && (tmpConnState <= (int)ConnState::UNKNOWN)) { info.connState = ConnState(tmpConnState); @@ -1165,13 +1165,13 @@ ErrCode WifiDeviceProxy::GetIpInfo(IpInfo &info) return ErrCode(ret); } - info.ipAddress = reply.ReadInt32(); - info.gateway = reply.ReadInt32(); - info.netmask = reply.ReadInt32(); - info.primaryDns = reply.ReadInt32(); - info.secondDns = reply.ReadInt32(); - info.serverIp = reply.ReadInt32(); - info.leaseDuration = reply.ReadInt32(); + info.ipAddress = (uint32_t)reply.ReadInt32(); + info.gateway = (uint32_t)reply.ReadInt32(); + info.netmask = (uint32_t)reply.ReadInt32(); + info.primaryDns = (uint32_t)reply.ReadInt32(); + info.secondDns = (uint32_t)reply.ReadInt32(); + info.serverIp = (uint32_t)reply.ReadInt32(); + info.leaseDuration = (uint32_t)reply.ReadInt32(); return WIFI_OPT_SUCCESS; } @@ -1303,7 +1303,7 @@ ErrCode WifiDeviceProxy::RegisterCallBack(const sptr &callb data.WriteInt32(pid); int tokenId = GetCallingTokenId(); data.WriteInt32(tokenId); - int eventNum = event.size(); + int eventNum = (int)event.size(); data.WriteInt32(eventNum); if (eventNum > 0) { for (auto &eventName : event) { diff --git a/wifi/frameworks/native/src/wifi_hotspot_proxy.cpp b/wifi/frameworks/native/src/wifi_hotspot_proxy.cpp index af0db280e..59c0467aa 100644 --- a/wifi/frameworks/native/src/wifi_hotspot_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_hotspot_proxy.cpp @@ -659,7 +659,7 @@ ErrCode WifiHotspotProxy::RegisterCallBack(const sptr &cal WIFI_LOGE("WifiHotspotProxy::RegisterCallBack WriteDate fail, write callback."); return WIFI_OPT_FAILED; } - int eventNum = event.size(); + int eventNum = (int)event.size(); data.WriteInt32(eventNum); if (eventNum > 0) { for (auto &eventName : event) { diff --git a/wifi/frameworks/native/src/wifi_p2p_proxy.cpp b/wifi/frameworks/native/src/wifi_p2p_proxy.cpp index a1768e238..a4d672a47 100644 --- a/wifi/frameworks/native/src/wifi_p2p_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_p2p_proxy.cpp @@ -1128,7 +1128,7 @@ ErrCode WifiP2pProxy::RegisterCallBack(const sptr &callback, c data.WriteInt32(pid); int tokenId = GetCallingTokenId(); data.WriteInt32(tokenId); - int eventNum = event.size(); + int eventNum = (int)event.size(); data.WriteInt32(eventNum); if (eventNum > 0) { for (auto &eventName : event) { diff --git a/wifi/frameworks/native/src/wifi_scan_proxy.cpp b/wifi/frameworks/native/src/wifi_scan_proxy.cpp index 7b82012e8..0b06bf219 100644 --- a/wifi/frameworks/native/src/wifi_scan_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_scan_proxy.cpp @@ -307,7 +307,7 @@ ErrCode WifiScanProxy::GetScanInfoList(std::vector &result, bool c } for (int m = 0; m < ieSize; ++m) { WifiInfoElem tempWifiInfoElem; - tempWifiInfoElem.id = reply.ReadInt32(); + tempWifiInfoElem.id = (uint32_t)reply.ReadInt32(); int contentSize = reply.ReadInt32(); for (int n = 0; n < contentSize; n++) { char tempChar = static_cast(reply.ReadInt8()); @@ -350,7 +350,7 @@ ErrCode WifiScanProxy::RegisterCallBack(const sptr &callback, data.WriteInt32(pid); int tokenId = GetCallingTokenId(); data.WriteInt32(tokenId); - int eventNum = event.size(); + int eventNum = (int)event.size(); data.WriteInt32(eventNum); if (eventNum > 0) { for (auto &eventName : event) { diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/src/context.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/context.c index dcac47854..645d47af9 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/src/context.c +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/src/context.c @@ -206,7 +206,7 @@ int ContextAppendWrite(Context *context, const char *buf, int len) if (tmp < len && memmove_s(context->szWrite, len - tmp, buf + tmp, len - tmp) != EOK) { return -1; } - context->wEnd = len - tmp; + context->wEnd = (uint32_t)(len - tmp); } return 0; } @@ -220,7 +220,7 @@ char *ContextGetReadRecord(Context *context) if (context->rBegin == context->rEnd) { return NULL; } - int len = (context->rBegin <= context->rEnd) ? (context->rEnd - context->rBegin) + uint32_t len = (context->rBegin <= context->rEnd) ? (context->rEnd - context->rBegin) : (context->rCapacity - context->rBegin + context->rEnd); char *buf = (char *)calloc(len + 1, sizeof(char)); if (buf == NULL) { @@ -232,7 +232,7 @@ char *ContextGetReadRecord(Context *context) return NULL; } } else { - int tmp = context->rCapacity - context->rBegin; + int tmp = (int)(context->rCapacity - context->rBegin); if (tmp > 0 && memmove_s(buf, len + 1, context->szRead + context->rBegin, tmp) != EOK) { free(buf); return NULL; diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/src/hash_table.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/hash_table.c index e7014d919..14ec1fdc2 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/src/hash_table.c +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/src/hash_table.c @@ -57,7 +57,7 @@ HashTable *InitHashTable(int slots) if (p == NULL) { return NULL; } - p->slots = CalcNextPrime(slots); + p->slots = (uint32_t)CalcNextPrime(slots); p->list = (ListNode **)calloc(p->slots, sizeof(ListNode *)); if (p->list == NULL) { free(p); @@ -69,7 +69,7 @@ HashTable *InitHashTable(int slots) void DestroyHashTable(HashTable *p) { int i = 0; - int nCount = p->slots; + uint32_t nCount = p->slots; for (; i < nCount; ++i) { ListNode *t = p->list[i]; while (t != NULL) { @@ -99,8 +99,8 @@ static int RebuildHashTable(HashTable *p) LOGE("rebuild hash table calloc failed!"); return -1; } - int orgSlot = p->slots; - p->slots = slot; + uint32_t orgSlot = p->slots; + p->slots = (uint32_t)slot; for (int i = 0; i < orgSlot; ++i) { ListNode *t = p->list[i]; while (t != NULL) { diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/src/serial.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/serial.c index b3be243db..b8c0984a3 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/src/serial.c +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/src/serial.c @@ -45,7 +45,7 @@ int WriteFunc(Context *context, const char *funcName) return -1; } - int len = strlen(funcName) + 1; + int len = (int)strlen(funcName) + 1; if (len <= 0) { return -1; } @@ -135,7 +135,7 @@ int WriteStr(Context *context, const char *pStr) return -1; } - int len = strlen(pStr) + 1; + int len = (int)(strlen(pStr) + 1); if (len <= 0) { return -1; } @@ -281,7 +281,7 @@ int ReadInt(Context *context, int *iData) return len; } *iData = atoi(szTmp); - context->nPos += len + 1; + context->nPos += (uint32_t)(len + 1); return 0; } @@ -297,7 +297,7 @@ int ReadLong(Context *context, long *pLong) return len; } *pLong = atol(szTmp); - context->nPos += len + 1; + context->nPos += (uint32_t)(len + 1); return 0; } @@ -313,7 +313,7 @@ int ReadInt64(Context *context, int64_t *pInt64) return len; } *pInt64 = atoll(szTmp); - context->nPos += len + 1; + context->nPos += (uint32_t)(len + 1); return 0; } @@ -329,7 +329,7 @@ int ReadDouble(Context *context, double *dData) return len; } *dData = atof(szTmp); - context->nPos += len + 1; + context->nPos += (uint32_t)(len + 1); return 0; } @@ -347,7 +347,7 @@ int ReadChar(Context *context, char *cData) return SERIAL_READ_TOO_LONG; } *cData = *(context->oneProcess + context->nPos); - context->nPos += len + 1; + context->nPos += (uint32_t)(len + 1); return 0; } @@ -367,7 +367,7 @@ int ReadStr(Context *context, char *str, int count) if (strncpy_s(str, count, context->oneProcess + context->nPos, len) != EOK) { return -1; } - context->nPos += len + 1; + context->nPos += (uint32_t)(len + 1); return 0; } @@ -406,6 +406,6 @@ int ReadUStr(Context *context, unsigned char *uStr, int count) uStr[j++] = byte; } uStr[j] = 0; - context->nPos += len + 1; + context->nPos += (uint32_t)(len + 1); return 0; } diff --git a/wifi/services/wifi_standard/ipc_framework/cRPC/src/server.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/server.c index 7977dd27a..903215880 100644 --- a/wifi/services/wifi_standard/ipc_framework/cRPC/src/server.c +++ b/wifi/services/wifi_standard/ipc_framework/cRPC/src/server.c @@ -254,7 +254,7 @@ static int BeforeLoop(RpcServer *server) pthread_mutex_lock(&server->mutex); for (int i = 0; i < server->nEvents; ++i) { int event = server->events[i]; - int num = sizeof(server->eventNode) / sizeof(server->eventNode[0]); + uint32_t num = sizeof(server->eventNode) / sizeof(server->eventNode[0]); int pos = event % num; struct Node *p = server->eventNode[pos].head; while (p != NULL) { @@ -275,7 +275,7 @@ int EmitEvent(RpcServer *server, int event) if (server == NULL) { return -1; } - int num = sizeof(server->events) / sizeof(server->events[0]); + uint32_t num = sizeof(server->events) / sizeof(server->events[0]); pthread_mutex_lock(&server->mutex); if (server->nEvents >= num) { pthread_mutex_unlock(&server->mutex); @@ -297,7 +297,7 @@ int RegisterCallback(RpcServer *server, int event, Context *context) return -1; } - int num = sizeof(server->eventNode) / sizeof(server->eventNode[0]); + uint32_t num = sizeof(server->eventNode) / sizeof(server->eventNode[0]); int pos = event % num; if (pos >= MAX_EVENT_NODE_COUNT) { return -1; @@ -324,7 +324,7 @@ int UnRegisterCallback(RpcServer *server, int event, const Context *context) return -1; } - int num = sizeof(server->eventNode) / sizeof(server->eventNode[0]); + uint32_t num = sizeof(server->eventNode) / sizeof(server->eventNode[0]); int pos = event % num; if (pos >= MAX_EVENT_NODE_COUNT) { return -1; @@ -354,7 +354,7 @@ static int RemoveCallback(RpcServer *server, const Context *context) return -1; } - int num = sizeof(server->eventNode) / sizeof(server->eventNode[0]); + uint32_t num = sizeof(server->eventNode) / sizeof(server->eventNode[0]); for (int i = 0; i < num; ++i) { struct Node *p = server->eventNode[i].head; if (p == NULL) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap_sa/wifi_hotspot_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap_sa/wifi_hotspot_stub.cpp index 13b962af5..b4f7e34b6 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap_sa/wifi_hotspot_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap_sa/wifi_hotspot_stub.cpp @@ -214,7 +214,7 @@ void WifiHotspotStub::OnGetStationList(uint32_t code, MessageParcel &data, Messa reply.WriteInt32(0); reply.WriteInt32(ret); if (ret == WIFI_OPT_SUCCESS) { - int size = result.size(); + int size = (int)result.size(); reply.WriteInt32(size); for (int i = 0; i < size; i++) { reply.WriteCString(result[i].deviceName.c_str()); @@ -260,7 +260,7 @@ void WifiHotspotStub::OnGetValidBands(uint32_t code, MessageParcel &data, Messag reply.WriteInt32(0); reply.WriteInt32(ret); if (ret == WIFI_OPT_SUCCESS) { - int count = bands.size(); + int count = (int)bands.size(); reply.WriteInt32(count); for (int i = 0; i < count; i++) { reply.WriteInt32((int)bands[i]); @@ -280,7 +280,7 @@ void WifiHotspotStub::OnGetValidChannels( reply.WriteInt32(0); reply.WriteInt32(ret); if (ret == WIFI_OPT_SUCCESS) { - int count = channels.size(); + int count = (int)channels.size(); reply.WriteInt32(count); for (int i = 0; i < count; i++) { reply.WriteInt32(channels[i]); @@ -369,7 +369,7 @@ void WifiHotspotStub::OnGetBlockLists(uint32_t code, MessageParcel &data, Messag reply.WriteInt32(0); reply.WriteInt32(ret); if (ret == WIFI_OPT_SUCCESS) { - int size = infos.size(); + int size = (int)infos.size(); reply.WriteInt32(size); for (int i = 0; i < size; i++) { reply.WriteCString(infos[i].deviceName.c_str()); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_sa/wifi_p2p_callback_proxy.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_sa/wifi_p2p_callback_proxy.cpp index db33ac266..9bb262e5d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_sa/wifi_p2p_callback_proxy.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_sa/wifi_p2p_callback_proxy.cpp @@ -122,7 +122,7 @@ void WifiP2pCallbackProxy::OnP2pPeersChanged(const std::vector &d return; } data.WriteInt32(0); - int size = devices.size(); + int size = (int)devices.size(); data.WriteInt32(size); for (int i = 0; i < size; ++i) { WriteWifiP2pDeviceData(data, devices[i]); @@ -148,7 +148,7 @@ void WifiP2pCallbackProxy::OnP2pServicesChanged(const std::vector WIFI_P2P_PASSPHRASE_MAX_LEN) { WIFI_LOGE("CreateGroup:VerifyPassphrase length failed!"); return WIFI_OPT_INVALID_PARAM; @@ -518,7 +518,7 @@ ErrCode WifiP2pServiceImpl::P2pConnect(const WifiP2pConfig &config) return WIFI_OPT_INVALID_PARAM; } - int passLen = config.GetPassphrase().length(); + uint32_t passLen = config.GetPassphrase().length(); if (passLen != 0 && (passLen < WIFI_P2P_PASSPHRASE_MIN_LEN || passLen > WIFI_P2P_PASSPHRASE_MAX_LEN)) { WIFI_LOGE("P2pConnect:VerifyPassphrase failed!"); return WIFI_OPT_INVALID_PARAM; @@ -966,7 +966,7 @@ ErrCode WifiP2pServiceImpl::SetP2pDeviceName(const std::string &deviceName) return WIFI_OPT_PERMISSION_DENIED; } - int length = deviceName.length(); + uint32_t length = deviceName.length(); if (length > DEVICE_NAME_LENGTH || length < 0) { return WIFI_OPT_INVALID_PARAM; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_sa/wifi_p2p_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_sa/wifi_p2p_stub.cpp index 4b1cc9dd0..c2fa95bc6 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_sa/wifi_p2p_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_sa/wifi_p2p_stub.cpp @@ -406,7 +406,7 @@ void WifiP2pStub::OnQueryP2pDevices(uint32_t code, MessageParcel &data, MessageP reply.WriteInt32(0); reply.WriteInt32(ret); if (ret == WIFI_OPT_SUCCESS) { - int size = devices.size(); + int size = (int)devices.size(); reply.WriteInt32(size); for (int i = 0; i < size; ++i) { WriteWifiP2pDeviceData(reply, devices[i]); @@ -438,7 +438,7 @@ void WifiP2pStub::OnQueryP2pGroups(uint32_t code, MessageParcel &data, MessagePa reply.WriteInt32(ret); if (ret == WIFI_OPT_SUCCESS) { - int size = groups.size(); + int size = (int)groups.size(); reply.WriteInt32(size); for (int i = 0; i < size; ++i) { WriteWifiP2pGroupData(reply, groups[i]); @@ -456,7 +456,7 @@ void WifiP2pStub::OnQueryP2pServices(uint32_t code, MessageParcel &data, Message reply.WriteInt32(ret); if (ret == WIFI_OPT_SUCCESS) { - int size = services.size(); + int size = (int)services.size(); reply.WriteInt32(size); for (int i = 0; i < size; ++i) { WriteWifiP2pServiceInfo(reply, services[i]); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_sa/wifi_scan_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_sa/wifi_scan_stub.cpp index 9a58e39b5..42ab1e0ed 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_sa/wifi_scan_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_sa/wifi_scan_stub.cpp @@ -168,7 +168,7 @@ int WifiScanStub::OnScanByParams(uint32_t code, MessageParcel &data, MessageParc int tmp = data.ReadInt32(); params.freqs.push_back(tmp); } - params.band = data.ReadInt32(); + params.band = (uint32_t)data.ReadInt32(); std::string name = data.ReadString(); WifiSettings::GetInstance().SetAppPackageName(name); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp index adbd3c1dc..19d28d20d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp @@ -246,13 +246,13 @@ bool WifiDeviceServiceImpl::CheckConfigPwd(const WifiDeviceConfig &config) return false; } - int len = config.preSharedKey.length(); + int len = (int)config.preSharedKey.length(); bool isAllHex = std::all_of(config.preSharedKey.begin(), config.preSharedKey.end(), isxdigit); WIFI_LOGI("CheckConfigPwd, ssid: %{public}s, psk len: %{public}d", SsidAnonymize(config.ssid).c_str(), len); if (config.keyMgmt == KEY_MGMT_WEP) { for (int i = 0; i != WEPKEYS_SIZE; ++i) { if (!config.wepKeys[i].empty()) { // wep - int wepLen = config.wepKeys[i].size(); + uint32_t wepLen = config.wepKeys[i].size(); if (wepLen == WEP_KEY_LEN1 || wepLen == WEP_KEY_LEN2 || wepLen == WEP_KEY_LEN3) { return true; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_stub.cpp index c0edf9bfe..9e31b75c4 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_stub.cpp @@ -382,7 +382,7 @@ void WifiDeviceStub::ReadIpAddress(MessageParcel &data, WifiIpAddress &address) { constexpr int MAX_LIMIT_SIZE = 1024; address.family = data.ReadInt32(); - address.addressIpv4 = data.ReadInt32(); + address.addressIpv4 = (uint32_t)data.ReadInt32(); int size = data.ReadInt32(); if (size > MAX_LIMIT_SIZE) { WIFI_LOGE("Read ip address parameter error: %{public}d", size); @@ -446,7 +446,7 @@ void WifiDeviceStub::WriteIpAddress(MessageParcel &reply, const WifiIpAddress &a { reply.WriteInt32(address.family); reply.WriteInt32(address.addressIpv4); - int size = address.addressIpv6.size(); + int size = (int)address.addressIpv6.size(); reply.WriteInt32(size); for (int i = 0; i < size; i++) { reply.WriteInt8(address.addressIpv6[i]); diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.c index 7493c002e..eca3fa2aa 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.c @@ -52,7 +52,7 @@ static int ReadConfigModuleName(char *name, int size) break; } rewind(fp); - int ret = fread(name, sizeof(char), (size_t)len, fp); + uint32_t ret = fread(name, sizeof(char), (size_t)len, fp); if (ret != len) { LOGE("read file failed!"); break; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c index 3459dd04c..fa4474d16 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c @@ -97,7 +97,7 @@ int RpcGetCommonCmd(RpcServer *server, Context *context) if (ReadStr(context, recvCmd, sizeof(recvCmd)) != 0) { return HAL_FAILURE; } - WifiErrorNo err = SendComCmd(recvCmd); + WifiErrorNo err = (uint32_t)SendComCmd(recvCmd); WriteBegin(context, 0); WriteInt(context, err); WriteEnd(context); diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c index f81f32ae1..54c95fffd 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c @@ -665,7 +665,7 @@ static int AddParam(unsigned int position, const char *cmd, const char *arg, cha LOGE("%{public}s sprintf_s cmd fail", __func__); return -1; } - position += ret; + position += (uint32_t)ret; return position; } diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c index 3c5f6d0ec..b40e64fb6 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c @@ -1178,7 +1178,7 @@ static P2pSupplicantErrCode WpaP2pCliCmdP2pGetChba0Freq(WifiWpaP2pInterface *thi static int CheckValidGroupConfigField(const P2pWpaGroupConfigArgv *argv) { int pos = -1; - for (unsigned i = 0; i < sizeof(g_p2pWpaNetworkFields) / sizeof(g_p2pWpaNetworkFields[0]); ++i) { + for (int i = 0; i < sizeof(g_p2pWpaNetworkFields) / sizeof(g_p2pWpaNetworkFields[0]); ++i) { if (g_p2pWpaNetworkFields[i].field == argv->param) { pos = i; break; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_common_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_common_hal.c index c3a803f4f..b6d5bfdea 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_common_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_common_hal.c @@ -50,7 +50,7 @@ int SendComCmd(const char* sendcmd) } size_t bufLen = strlen(buf); if (strncmp(cmd, "IFNAME=chba0 STATUS", strlen("IFNAME=chba0 STATUS")) == 0) { - for (int i = 0; i < bufLen; i++) { + for (size_t i = 0; i < bufLen; i++) { buf[i] = buf[i] == '\n' ? '*' : buf[i]; } char *sep = "*"; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c index 23d628c8f..23d173890 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c @@ -254,7 +254,7 @@ static int WpaCliCmdSetNetwork(WifiWpaStaInterface *this, const struct WpaSetNet return -1; } int pos = -1; - for (unsigned i = 0; i < sizeof(g_wpaSsidFields) / sizeof(g_wpaSsidFields[0]); ++i) { + for (int i = 0; i < sizeof(g_wpaSsidFields) / sizeof(g_wpaSsidFields[0]); ++i) { if (g_wpaSsidFields[i].field == argv->param) { pos = i; break; @@ -1145,7 +1145,7 @@ static void GetInfoElems(int length, int end, char *srcBuf, ScanInfo *pcmd) while (remainingLength > 1 && start < length) { if (srcBuf[start] == '[') { ++start; - infoElemsTemp[infoElemsSize].id = atoi(srcBuf + start); + infoElemsTemp[infoElemsSize].id = (uint32_t)atoi(srcBuf + start); } if (srcBuf[start] != ' ') { ++start; -- Gitee