openharmony/communication_dsoftbus
1
0
Fork 0
mirror of https://gitee.com/openharmony/communication_dsoftbus synced 2025-02-06 02:18:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

review代码规范整改

Browse Source 
Signed-off-by: y500286920 <yangliu158@huawei.com>
This commit is contained in:
y500286920 2022-07-29 15:50:43 +08:00
parent aff8f165ab
commit 40ca1e18ac
14 changed files with 63 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adapter/common/bus_center/driver/lnn_driver_monitor_virtual.c
View File

@ -16,8 +16,6 @@
#include "lnn_event_monitor_impl.h"
#include "softbus_errcode.h"
int32_t LnnInitDriverMonitorImpl(void)
{
return SOFTBUS_OK;

3
adapter/common/bus_center/network/lnn_linkwatch.c
View File

@ -106,8 +106,9 @@ static int32_t RtNetlinkTalk(struct nlmsghdr *nlMsgHdr, struct nlmsghdr *answer,
while (true) {
status = SoftBusSocketRecv(fd, answer, maxlen, 0);
if (status < 0) {
if (status == SOFTBUS_ADAPTER_SOCKET_EINTR || status == SOFTBUS_ADAPTER_SOCKET_EAGAIN)
if (status == SOFTBUS_ADAPTER_SOCKET_EINTR || status == SOFTBUS_ADAPTER_SOCKET_EAGAIN){
continue;
}
SoftBusLog(SOFTBUS_LOG_LNN, SOFTBUS_LOG_ERROR, "netlink receive error (%d)", status);
SoftBusSocketClose(fd);
return SOFTBUS_ERR;

1
adapter/common/kernel/liteos_a/softbus_adapter_socket.c
View File

@ -105,7 +105,6 @@ int32_t SoftBusSocketGetError(int32_t socketFd)
{
int err = 0;
socklen_t errSize = sizeof(err);
int32_t ret = getsockopt(socketFd, SOL_SOCKET, SO_ERROR, &err, &errSize);
if (ret < 0) {
HILOG_ERROR(SOFTBUS_HILOG_ID, "getsockopt fd=%{public}d, ret=%{public}d", socketFd, ret);

2
adapter/common/net/bluetooth/ble/softbus_adapter_ble_gatt_client.c
View File

@ -27,7 +27,7 @@
#define APP_UUID_LEN 2
#define INVALID_ID (-1)
static BtGattClientCallbacks g_btGattClientCallbacks = { 0 };
static BtGattClientCallbacks g_btGattClientCallbacks = {0};
static SoftBusGattcCallback *g_softBusGattcCallback = NULL;
static void GattcConnectionStateChangedCallback(int clientId, int connectionState, int status)

2
adapter/common/net/bluetooth/ble/softbus_adapter_ble_gatt_server.c
View File

@ -34,7 +34,7 @@ static const char SOFTBUS_APP_UUID[BT_UUID_LEN] = {
};
SoftBusGattsCallback *g_gattsCallback = NULL;
static BtGattServerCallbacks g_bleGattsHalCallback = { 0 };
static BtGattServerCallbacks g_bleGattsHalCallback = {0};
static int g_halServerId = -1;
static int g_halRegFlag = -1; // -1:not registered or register failed; 0:registerring; 1:registered

2
components/nstackx/fillp/include/fillpinc.h
View File

@ -397,7 +397,7 @@ typedef struct FillpTraceDescriptStruct {
#define FILLP_TRACE_DESC_INIT(dir) \
{ \
(dir), \
{ 0 }, \
{0}, \
}
/**

2
components/nstackx/nstackx_congestion/platform/unix/qdisc/nstackx_nlmsg.c
View File

@ -134,7 +134,7 @@ int32_t RecvNetlinkResponse(int32_t nlSockFd, struct NlmsgCallback *nlcb)
};
int32_t recvLen;
char buf[MAX_NETLINK_BUFFER_LEN] = { 0 };
char buf[MAX_NETLINK_BUFFER_LEN] = {0};
iovRecv.iov_base = buf;
iovRecv.iov_len = MAX_NETLINK_BUFFER_LEN;

10
components/nstackx/nstackx_congestion/platform/unix/qdisc/nstackx_qdisc.c
View File

@ -30,7 +30,7 @@
static int32_t ProcessQdiscInfoInner(struct rtattr *tb[], int32_t parent)
{
struct rtattr *tbs[TCA_STATS_MAX + 1] = { 0 };
struct rtattr *tbs[TCA_STATS_MAX + 1] = {0};
(void)parent;
struct rtattr *rta = RTA_DATA(tb[TCA_STATS2]); // tb is trusted
@ -69,7 +69,7 @@ static void ProcessQdiscInfo(struct nlmsghdr *h, void *arg, void *value)
return;
}
struct tcmsg *tcMsgRecv = NLMSG_DATA(h); // h is trusted
struct rtattr *tb[TCA_MAX + 1] = { 0 };
struct rtattr *tb[TCA_MAX + 1] = {0};
int32_t len = (int32_t)(h->nlmsg_len);
len -= NLMSG_LENGTH(sizeof(*tcMsgRecv));
if (len < 0) {
@ -101,7 +101,7 @@ static int32_t GetQdiscUsedLength(const char *devName, int32_t protocol, int32_t
int32_t sendNetlinkRequestCount = SEND_NETLINK_REQUEST_COUNT;
struct NlmsgCallback nlcb;
QdiscArg qdiscArg;
QdiscValue qdiscValue = { 0 };
QdiscValue qdiscValue = {0};
qdiscArg.ifIndex = (int32_t)if_nametoindex(devName);
qdiscArg.protocol = protocol;
@ -145,7 +145,7 @@ static inline int32_t CheckQdiscAllLen(int32_t qdiscAllLen)
static int32_t GetQdiscAllLengthFromFile(const char *devName)
{
char qdiscFileName[QDISC_FILE_NAME_NAX_LENGTH] = { 0 };
char qdiscFileName[QDISC_FILE_NAME_NAX_LENGTH] = {0};
int32_t ret = sprintf_s(
qdiscFileName, QDISC_FILE_NAME_NAX_LENGTH, "/sys/devices/virtual/net/%s/tx_queue_len", devName);
if (ret <= 0) {
@ -154,7 +154,7 @@ static int32_t GetQdiscAllLengthFromFile(const char *devName)
}
char *fileName = qdiscFileName;
char absolutePath[PATH_MAX + 1] = { 0 }; // +1 is avoiding array out of bound
char absolutePath[PATH_MAX + 1] = {0}; // +1 is avoiding array out of bound
if (realpath(qdiscFileName, absolutePath) == NULL) {
LOGE(TAG, "realpath failed");
} else {

10
components/nstackx/nstackx_congestion/platform/unix/wifi/nstackx_wifi_stat_linux.c
View File

@ -58,8 +58,8 @@ static int32_t GetScanInfo(struct nl_msg *msg, void *arg)
{
struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
struct nlattr *tb[NL80211_ATTR_MAX + 1] = { 0 };
struct nlattr *bss[NL80211_BSS_MAX + 1] = { 0 };
struct nlattr *tb[NL80211_ATTR_MAX + 1] = {0};
struct nlattr *bss[NL80211_BSS_MAX + 1] = {0};
struct nla_policy bssPolicy[NL80211_BSS_MAX + 1] = {
[NL80211_BSS_FREQUENCY] = { .type = NLA_U32 },
[NL80211_BSS_BSSID] = { },
@ -102,7 +102,7 @@ static inline uint32_t ResolveBitrateInfoInner(struct nlattr *rInfo[])
static int32_t ResolveBitrateInfo(struct nlattr *bitrateAttr, WifiRateInfo *rateInfo)
{
struct nlattr *rInfo[NL80211_RATE_INFO_MAX + 1] = { 0 };
struct nlattr *rInfo[NL80211_RATE_INFO_MAX + 1] = {0};
static struct nla_policy ratePolicy[NL80211_RATE_INFO_MAX + 1] = {
[NL80211_RATE_INFO_BITRATE] = { .type = NLA_U16 },
[NL80211_RATE_INFO_BITRATE32] = { .type = NLA_U32 },
@ -155,10 +155,10 @@ static void GetStationInfoRate(WifiStationInfo *wifiStationInfo, struct nlattr *
static int32_t GetStationInfo(struct nl_msg *msg, void *arg)
{
struct nlattr *tb[NL80211_ATTR_MAX + 1] = { 0 };
struct nlattr *tb[NL80211_ATTR_MAX + 1] = {0};
struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
struct nlattr *sinfo[NL80211_STA_INFO_MAX + 1] = { 0 };
struct nlattr *sinfo[NL80211_STA_INFO_MAX + 1] = {0};
static struct nla_policy statsPolicy[NL80211_STA_INFO_MAX + 1] = {
[NL80211_STA_INFO_SIGNAL] = { .type = NLA_U8 },
[NL80211_STA_INFO_RX_BITRATE] = { .type = NLA_NESTED },

2
components/nstackx/nstackx_util/core/nstackx_log.c
View File

@ -25,7 +25,7 @@ static uint32_t g_logLevel = NSTACKX_LOG_LEVEL_INFO;
#ifdef BUILD_FOR_WINDOWS
static void DefaultLogImpl(const char *tag, uint32_t level, const char *format, va_list args)
{
SYSTEMTIME st = { 0 };
SYSTEMTIME st = {0};
GetLocalTime(&st);
printf("%02d-%02d %02d:%02d:%02d.%03d %d %d %d %s: ", st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond,

2
core/connection/ble/src/softbus_ble_connection.c
View File

@ -81,7 +81,7 @@ static const int BLE_ROLE_SERVER = 2;
static LIST_HEAD(g_connection_list);
static ConnectCallback *g_connectCallback = NULL;
static ConnectFuncInterface g_bleInterface = { 0 };
static ConnectFuncInterface g_bleInterface = {0};
static SoftBusMutex g_connectionLock;
static void PackRequest(int32_t delta, uint32_t connectionId);

2
core/connection/ble/src/softbus_ble_gatt_client.c
View File

@ -70,7 +70,7 @@ typedef struct {
SoftBusBtAddr peerAddr;
} BleGattcInfo;
static SoftBusGattcCallback g_softbusGattcCb = { 0 };
static SoftBusGattcCallback g_softbusGattcCb = {0};
static SoftBusBleConnCalback *g_softBusBleConnCb = NULL;
static SoftBusList *g_gattcInfoList = NULL;
static bool g_gattcIsInited = false;

52
tests/adapter/unittest/softbus_socket_test.cpp
View File

@ -76,10 +76,10 @@ static void SocketServiceStart(int localFlag)
int32_t socketFd = -1;
int32_t optVal = 1;
int32_t backLog = 2;
SoftBusSockAddrIn cliAddr = { 0 };
SoftBusSockAddrIn cliAddr = {0};
int addrLen = sizeof(SoftBusSockAddrIn);
int acceptFd = -1;
struct SocketProtocol buf = { 0 };
struct SocketProtocol buf = {0};
int32_t ret = SoftBusSocketCreate(SOFTBUS_AF_INET, SOFTBUS_SOCK_STREAM, 0, &socketFd);
EXPECT_EQ(0, ret);
@ -833,7 +833,7 @@ HWTEST_F(DsoftbusSocketTest, SoftBusSocketAccept003, TestSize.Level0)
.sAddr = SoftBusInetAddr("127.0.0.1")
}
};
SoftBusSockAddrIn cliAddr = { 0 };
SoftBusSockAddrIn cliAddr = {0};
int addrLen = sizeof(SoftBusSockAddrIn);
int32_t ret = SoftBusSocketCreate(SOFTBUS_AF_INET, SOFTBUS_SOCK_STREAM, 0, &socketFd);
EXPECT_EQ(0, ret);
@ -951,7 +951,7 @@ HWTEST_F(DsoftbusSocketTest, SoftBusSocketFdZeroTest001, TestSize.Level0)
*/
HWTEST_F(DsoftbusSocketTest, SoftBusSocketFdZeroTest002, TestSize.Level0)
{
SoftBusFdSet set = { 0 };
SoftBusFdSet set = {0};
set.fdsBits[0] = 1;
SoftBusSocketFdZero(&set);
EXPECT_TRUE(set.fdsBits[0] == 0);
@ -966,7 +966,7 @@ HWTEST_F(DsoftbusSocketTest, SoftBusSocketFdZeroTest002, TestSize.Level0)
HWTEST_F(DsoftbusSocketTest, SoftBusSocketFdSetTest001, TestSize.Level0)
{
int32_t socketFd;
SoftBusFdSet set = { 0 };
SoftBusFdSet set = {0};
int32_t ret = SoftBusSocketCreate(SOFTBUS_AF_INET, SOFTBUS_SOCK_STREAM, 0, &socketFd);
EXPECT_EQ(0, ret);
SoftBusSocketFdSet(socketFd, &set);
@ -1052,7 +1052,7 @@ HWTEST_F(DsoftbusSocketTest, SoftBusSocketFdIssetTest001, TestSize.Level0)
*/
HWTEST_F(DsoftbusSocketTest, SoftBusSocketFdIssetTest002, TestSize.Level0)
{
SoftBusFdSet set = { 0 };
SoftBusFdSet set = {0};
SoftBusSocketFdClr(1, &set);
int ret = SoftBusSocketFdIsset(1, &set);
EXPECT_TRUE(ret == 0);
@ -1283,7 +1283,7 @@ HWTEST_F(DsoftbusSocketTest, SoftBusSocketFcntlTest002, TestSize.Level0)
HWTEST_F(DsoftbusSocketTest, SoftBusSocketSendTest001, TestSize.Level0)
{
int32_t socketFd = -1;
char buf[TEST_BUF_SIZE] = { 0 };
char buf[TEST_BUF_SIZE] = {0};
int32_t ret = SoftBusSocketSend(socketFd, buf, TEST_BUF_SIZE, 0);
EXPECT_EQ(-1, ret);
@ -1313,7 +1313,7 @@ HWTEST_F(DsoftbusSocketTest, SoftBusSocketSendTest002, TestSize.Level0)
.sAddr = SoftBusInetAddr("127.0.0.1")
}
};
struct SocketProtocol buf = { 0 };
struct SocketProtocol buf = {0};
int32_t ret = SoftBusSocketCreate(SOFTBUS_AF_INET, SOFTBUS_SOCK_STREAM, 0, &socketFd);
EXPECT_EQ(0, ret);
ret = SoftBusSocketConnect(socketFd, (SoftBusSockAddr *)&serAddr, sizeof(SoftBusSockAddrIn));
@ -1351,7 +1351,7 @@ HWTEST_F(DsoftbusSocketTest, SoftBusSocketSendTest003, TestSize.Level0)
.sAddr = SoftBusInetAddr("127.0.0.1")
}
};
struct SocketProtocol buf = { 0 };
struct SocketProtocol buf = {0};
int32_t ret = SoftBusSocketCreate(SOFTBUS_AF_INET, SOFTBUS_SOCK_STREAM, 0, &socketFd);
EXPECT_EQ(0, ret);
ret = SoftBusSocketConnect(socketFd, (SoftBusSockAddr *)&serAddr, sizeof(SoftBusSockAddrIn));
@ -1384,7 +1384,7 @@ HWTEST_F(DsoftbusSocketTest, SoftBusSocketSendTest004, TestSize.Level0)
}
sleep(1);
int32_t socketFd = -1;
struct SocketProtocol buf = { 0 };
struct SocketProtocol buf = {0};
ClientConnect(&socketFd);
buf.cmd = CMD_RECV;
@ -1407,7 +1407,7 @@ HWTEST_F(DsoftbusSocketTest, SoftBusSocketSendToTest001, TestSize.Level0)
SoftBusSockAddr addr = {
.saFamily = SOFTBUS_AF_INET,
};
struct SocketProtocol buf = { 0 };
struct SocketProtocol buf = {0};
int32_t ret = SoftBusSocketSendTo(socketFd, (void *)&buf, sizeof(buf), 0, &addr, sizeof(SoftBusSockAddr));
EXPECT_EQ(-1, ret);
}
@ -1428,7 +1428,7 @@ HWTEST_F(DsoftbusSocketTest, SoftBusSocketSendToTest002, TestSize.Level0)
}
sleep(1);
int32_t socketFd = -1;
struct SocketProtocol buf = { 0 };
struct SocketProtocol buf = {0};
SoftBusSockAddr addr = {
.saFamily = SOFTBUS_AF_INET,
};
@ -1458,7 +1458,7 @@ HWTEST_F(DsoftbusSocketTest, SoftBusSocketSendToTest003, TestSize.Level0)
}
sleep(1);
int32_t socketFd = -1;
struct SocketProtocol buf = { 0 };
struct SocketProtocol buf = {0};
SoftBusSockAddr addr = {
.saFamily = SOFTBUS_AF_INET,
};
@ -1486,7 +1486,7 @@ HWTEST_F(DsoftbusSocketTest, SoftBusSocketSendToTest004, TestSize.Level0)
}
sleep(1);
int32_t socketFd = -1;
struct SocketProtocol buf = { 0 };
struct SocketProtocol buf = {0};
ClientConnect(&socketFd);
int32_t ret = SoftBusSocketSendTo(socketFd, (void *)&buf, sizeof(buf), 0, NULL, sizeof(SoftBusSockAddr));
@ -1511,7 +1511,7 @@ HWTEST_F(DsoftbusSocketTest, SoftBusSocketSendToTest005, TestSize.Level0)
}
sleep(1);
int32_t socketFd = -1;
struct SocketProtocol buf = { 0 };
struct SocketProtocol buf = {0};
SoftBusSockAddr addr = {
.saFamily = SOFTBUS_AF_INET,
};
@ -1540,7 +1540,7 @@ HWTEST_F(DsoftbusSocketTest, SoftBusSocketSendToTest006, TestSize.Level0)
}
sleep(1);
int32_t socketFd = -1;
struct SocketProtocol buf = { 0 };
struct SocketProtocol buf = {0};
SoftBusSockAddr addr = {
.saFamily = SOFTBUS_AF_INET,
};
@ -1561,7 +1561,7 @@ HWTEST_F(DsoftbusSocketTest, SoftBusSocketSendToTest006, TestSize.Level0)
HWTEST_F(DsoftbusSocketTest, SoftBusSocketRecvTest001, TestSize.Level0)
{
int32_t socketFd = -1;
struct SocketProtocol buf = { 0 };
struct SocketProtocol buf = {0};
int32_t ret = SoftBusSocketRecv(socketFd, (void *)&buf, sizeof(struct SocketProtocol), 0);
EXPECT_EQ(-1, ret);
}
@ -1582,7 +1582,7 @@ HWTEST_F(DsoftbusSocketTest, SoftBusSocketRecvTest002, TestSize.Level0)
}
sleep(1);
int32_t socketFd = -1;
struct SocketProtocol buf = { 0 };
struct SocketProtocol buf = {0};
ClientConnect(&socketFd);
buf.cmd = CMD_RECV;
@ -1606,7 +1606,7 @@ HWTEST_F(DsoftbusSocketTest, SoftBusSocketRecvTest002, TestSize.Level0)
HWTEST_F(DsoftbusSocketTest, SoftBusSocketRecvFromTest001, TestSize.Level0)
{
int32_t socketFd = -1;
SoftBusSockAddr fromAddr = { 0 };
SoftBusSockAddr fromAddr = {0};
int32_t fromAddrLen;
int32_t ret = SoftBusSocketRecvFrom(socketFd, NULL, 0, 0, &fromAddr, &fromAddrLen);
EXPECT_EQ(-1, ret);
@ -1703,7 +1703,7 @@ HWTEST_F(DsoftbusSocketTest, SoftBusSocketCloseTest002, TestSize.Level0)
HWTEST_F(DsoftbusSocketTest, SoftBusInetPtoNTest001, TestSize.Level0)
{
const char *src = "192.168.0.1";
char dst[TEST_BUF_SIZE] = { 0 };
char dst[TEST_BUF_SIZE] = {0};
int32_t ret = SoftBusInetPtoN(SOFTBUS_AF_INET, src, dst);
EXPECT_EQ(0, ret);
EXPECT_EQ(0x100A8C0, *(unsigned int *)dst);
@ -1718,7 +1718,7 @@ HWTEST_F(DsoftbusSocketTest, SoftBusInetPtoNTest001, TestSize.Level0)
HWTEST_F(DsoftbusSocketTest, SoftBusInetPtoNTest002, TestSize.Level0)
{
const char *src = "abcde";
char dst[TEST_BUF_SIZE] = { 0 };
char dst[TEST_BUF_SIZE] = {0};
int32_t ret = SoftBusInetPtoN(SOFTBUS_AF_INET, src, dst);
EXPECT_EQ(SOFTBUS_ADAPTER_INVALID_PARAM, ret);
}
@ -1732,7 +1732,7 @@ HWTEST_F(DsoftbusSocketTest, SoftBusInetPtoNTest002, TestSize.Level0)
HWTEST_F(DsoftbusSocketTest, SoftBusInetPtoNTest003, TestSize.Level0)
{
const char *src = "1234";
char dst[TEST_BUF_SIZE] = { 0 };
char dst[TEST_BUF_SIZE] = {0};
int32_t ret = SoftBusInetPtoN(SOFTBUS_AF_INET, src, dst);
EXPECT_EQ(SOFTBUS_ADAPTER_INVALID_PARAM, ret);
}
@ -1746,7 +1746,7 @@ HWTEST_F(DsoftbusSocketTest, SoftBusInetPtoNTest003, TestSize.Level0)
HWTEST_F(DsoftbusSocketTest, SoftBusInetPtoNTest004, TestSize.Level0)
{
const char *src = "0x1234";
char dst[TEST_BUF_SIZE] = { 0 };
char dst[TEST_BUF_SIZE] = {0};
int32_t ret = SoftBusInetPtoN(SOFTBUS_AF_INET, src, dst);
EXPECT_EQ(SOFTBUS_ADAPTER_INVALID_PARAM, ret);
}
@ -1760,7 +1760,7 @@ HWTEST_F(DsoftbusSocketTest, SoftBusInetPtoNTest004, TestSize.Level0)
HWTEST_F(DsoftbusSocketTest, SoftBusInetPtoNTest005, TestSize.Level0)
{
const char *src = "__*0x1234";
char dst[TEST_BUF_SIZE] = { 0 };
char dst[TEST_BUF_SIZE] = {0};
int32_t ret = SoftBusInetPtoN(SOFTBUS_AF_INET, src, dst);
EXPECT_EQ(SOFTBUS_ADAPTER_INVALID_PARAM, ret);
}
@ -1774,7 +1774,7 @@ HWTEST_F(DsoftbusSocketTest, SoftBusInetPtoNTest005, TestSize.Level0)
HWTEST_F(DsoftbusSocketTest, SoftBusInetPtoNTest006, TestSize.Level0)
{
const char *src = "192.168.0.1";
char dst[TEST_BUF_SIZE] = { 0 };
char dst[TEST_BUF_SIZE] = {0};
int32_t ret = SoftBusInetPtoN(-1, src, dst);
EXPECT_EQ(SOFTBUS_ADAPTER_ERR, ret);
}
@ -1965,7 +1965,7 @@ HWTEST_F(DsoftbusSocketTest, SoftBusSocketFullFunc001, TestSize.Level0)
sleep(1);
int32_t ret;
int32_t socketFd = -1;
struct SocketProtocol buf = { 0 };
struct SocketProtocol buf = {0};
ClientConnect(&socketFd);
EXPECT_TRUE(socketFd != -1);

36
tests/adapter/unittest/softbus_thread_test.cpp
View File

@ -411,7 +411,7 @@ HWTEST_F(DsoftbusThreadTest, SoftBusThreadAttrInitTest001, TestSize.Level0)
*/
HWTEST_F(DsoftbusThreadTest, SoftBusThreadAttrInitTest002, TestSize.Level0)
{
SoftBusThreadAttr threadAttr = { 0 };
SoftBusThreadAttr threadAttr = {0};
int32_t ret = SoftBusThreadAttrInit(&threadAttr);
EXPECT_EQ(SOFTBUS_OK, ret);
}
@ -424,7 +424,7 @@ HWTEST_F(DsoftbusThreadTest, SoftBusThreadAttrInitTest002, TestSize.Level0)
*/
HWTEST_F(DsoftbusThreadTest, SoftBusThreadCreateTest001, TestSize.Level0)
{
SoftBusThreadAttr threadAttr = { 0 };
SoftBusThreadAttr threadAttr = {0};
int32_t ret = SoftBusThreadAttrInit(&threadAttr);
EXPECT_EQ(SOFTBUS_OK, ret);
@ -456,7 +456,7 @@ HWTEST_F(DsoftbusThreadTest, SoftBusThreadCreateTest002, TestSize.Level0)
HWTEST_F(DsoftbusThreadTest, SoftBusThreadCreateTest003, TestSize.Level0)
{
SoftBusThread thread = 0;
SoftBusThreadAttr threadAttr = { 0 };
SoftBusThreadAttr threadAttr = {0};
int32_t ret = SoftBusThreadAttrInit(&threadAttr);
EXPECT_EQ(SOFTBUS_OK, ret);
@ -475,7 +475,7 @@ HWTEST_F(DsoftbusThreadTest, SoftBusThreadCreateTest003, TestSize.Level0)
HWTEST_F(DsoftbusThreadTest, SoftBusThreadCreateTest004, TestSize.Level0)
{
SoftBusThread thread = 0;
SoftBusThreadAttr threadAttr = { 0 };
SoftBusThreadAttr threadAttr = {0};
int32_t ret = SoftBusThreadAttrInit(&threadAttr);
EXPECT_EQ(SOFTBUS_OK, ret);
@ -495,7 +495,7 @@ HWTEST_F(DsoftbusThreadTest, SoftBusThreadCreateTest004, TestSize.Level0)
HWTEST_F(DsoftbusThreadTest, SoftBusThreadCreateTest005, TestSize.Level0)
{
SoftBusThread thread = 0;
SoftBusThreadAttr threadAttr = { 0 };
SoftBusThreadAttr threadAttr = {0};
int32_t ret = SoftBusThreadAttrInit(&threadAttr);
EXPECT_EQ(SOFTBUS_OK, ret);
@ -514,7 +514,7 @@ HWTEST_F(DsoftbusThreadTest, SoftBusThreadCreateTest005, TestSize.Level0)
HWTEST_F(DsoftbusThreadTest, SoftBusThreadCreateTest006, TestSize.Level0)
{
SoftBusThread thread = 0;
SoftBusThreadAttr threadAttr = { 0 };
SoftBusThreadAttr threadAttr = {0};
int32_t ret = SoftBusThreadAttrInit(&threadAttr);
EXPECT_EQ(SOFTBUS_OK, ret);
@ -533,7 +533,7 @@ HWTEST_F(DsoftbusThreadTest, SoftBusThreadCreateTest006, TestSize.Level0)
HWTEST_F(DsoftbusThreadTest, SoftBusThreadCreateTest007, TestSize.Level0)
{
SoftBusThread thread = 0;
SoftBusThreadAttr threadAttr = { 0 };
SoftBusThreadAttr threadAttr = {0};
int32_t ret = SoftBusThreadAttrInit(&threadAttr);
EXPECT_EQ(SOFTBUS_OK, ret);
@ -552,7 +552,7 @@ HWTEST_F(DsoftbusThreadTest, SoftBusThreadCreateTest007, TestSize.Level0)
HWTEST_F(DsoftbusThreadTest, SoftBusThreadCreateTest008, TestSize.Level0)
{
SoftBusThread thread = 0;
SoftBusThreadAttr threadAttr = { 0 };
SoftBusThreadAttr threadAttr = {0};
int32_t ret = SoftBusThreadAttrInit(&threadAttr);
EXPECT_EQ(SOFTBUS_OK, ret);
@ -571,7 +571,7 @@ HWTEST_F(DsoftbusThreadTest, SoftBusThreadCreateTest008, TestSize.Level0)
HWTEST_F(DsoftbusThreadTest, SoftBusThreadCreateTest009, TestSize.Level0)
{
SoftBusThread thread = 0;
SoftBusThreadAttr threadAttr = { 0 };
SoftBusThreadAttr threadAttr = {0};
int32_t ret = SoftBusThreadAttrInit(&threadAttr);
EXPECT_EQ(SOFTBUS_OK, ret);
@ -591,7 +591,7 @@ HWTEST_F(DsoftbusThreadTest, SoftBusThreadCreateTest009, TestSize.Level0)
HWTEST_F(DsoftbusThreadTest, SoftBusThreadCreateTest010, TestSize.Level0)
{
SoftBusThread thread = 0;
SoftBusThreadAttr threadAttr = { 0 };
SoftBusThreadAttr threadAttr = {0};
int32_t ret = SoftBusThreadAttrInit(&threadAttr);
EXPECT_EQ(SOFTBUS_OK, ret);
@ -608,7 +608,7 @@ HWTEST_F(DsoftbusThreadTest, SoftBusThreadCreateTest010, TestSize.Level0)
HWTEST_F(DsoftbusThreadTest, SoftBusThreadSetNameTest001, TestSize.Level0)
{
SoftBusThread thread = 0;
SoftBusThreadAttr threadAttr = { 0 };
SoftBusThreadAttr threadAttr = {0};
int32_t ret = SoftBusThreadAttrInit(&threadAttr);
EXPECT_EQ(SOFTBUS_OK, ret);
@ -632,7 +632,7 @@ HWTEST_F(DsoftbusThreadTest, SoftBusThreadSetNameTest002, TestSize.Level0)
{
const char *name = "abcdefghijklmnopqrstuvwxyz";
SoftBusThread thread = 0;
SoftBusThreadAttr threadAttr = { 0 };
SoftBusThreadAttr threadAttr = {0};
int32_t ret = SoftBusThreadAttrInit(&threadAttr);
EXPECT_EQ(SOFTBUS_OK, ret);
@ -656,7 +656,7 @@ HWTEST_F(DsoftbusThreadTest, SoftBusThreadSetNameTest003, TestSize.Level0)
{
const char *name = "abcdefghijklmnop";
SoftBusThread thread = 0;
SoftBusThreadAttr threadAttr = { 0 };
SoftBusThreadAttr threadAttr = {0};
int32_t ret = SoftBusThreadAttrInit(&threadAttr);
EXPECT_EQ(SOFTBUS_OK, ret);
@ -680,7 +680,7 @@ HWTEST_F(DsoftbusThreadTest, SoftBusThreadSetNameTest004, TestSize.Level0)
{
const char *name = "a中文p";
SoftBusThread thread = 0;
SoftBusThreadAttr threadAttr = { 0 };
SoftBusThreadAttr threadAttr = {0};
int32_t ret = SoftBusThreadAttrInit(&threadAttr);
EXPECT_EQ(SOFTBUS_OK, ret);
@ -702,7 +702,7 @@ HWTEST_F(DsoftbusThreadTest, SoftBusThreadSetNameTest005, TestSize.Level0)
{
const char *name = "testThread";
SoftBusThread thread = 0;
SoftBusThreadAttr threadAttr = { 0 };
SoftBusThreadAttr threadAttr = {0};
int32_t ret = SoftBusThreadAttrInit(&threadAttr);
EXPECT_EQ(SOFTBUS_OK, ret);
@ -981,7 +981,7 @@ HWTEST_F(DsoftbusThreadTest, SoftBusCondDestroyTest003, TestSize.Level0)
HWTEST_F(DsoftbusThreadTest, SoftBusThreadJoinTest001, TestSize.Level0)
{
SoftBusThread thread = 0;
SoftBusThreadAttr threadAttr = { 0 };
SoftBusThreadAttr threadAttr = {0};
int32_t ret = SoftBusThreadAttrInit(&threadAttr);
EXPECT_EQ(SOFTBUS_OK, ret);
@ -1002,7 +1002,7 @@ HWTEST_F(DsoftbusThreadTest, SoftBusThreadJoinTest002, TestSize.Level0)
{
char *value = nullptr;
SoftBusThread thread = 0;
SoftBusThreadAttr threadAttr = { 0 };
SoftBusThreadAttr threadAttr = {0};
int32_t ret = SoftBusThreadAttrInit(&threadAttr);
EXPECT_EQ(SOFTBUS_OK, ret);
@ -1030,7 +1030,7 @@ HWTEST_F(DsoftbusThreadTest, SoftBusThreadFullTest001, TestSize.Level0)
SoftBusThread threadWait = 0;
SoftBusThread threadSignal = 0;
SoftBusThreadAttr threadAttr = { 0 };
SoftBusThreadAttr threadAttr = {0};
ret = SoftBusThreadAttrInit(&threadAttr);
EXPECT_EQ(SOFTBUS_OK, ret);