diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/wifi_net_agent.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/wifi_net_agent.cpp index b2c8cc9c69a83cd509c5fab48f75e5f840cea59d..a5e2011902776c4e82bbf198a659a90d2327f9ca 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/wifi_net_agent.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/wifi_net_agent.cpp @@ -87,7 +87,7 @@ bool WifiNetAgent::RegisterNetSupplierCallback(int instId) TimeStats timeStats(__func__); WIFI_LOGI("Enter RegisterNetSupplierCallback."); std::unique_lock lock(netAgentMutex_); - sptr pNetConnCallback = (std::make_unique()).release(); + sptr pNetConnCallback = sptr::MakeSptr(); if (pNetConnCallback == nullptr) { WIFI_LOGE("pNetConnCallback is null\n"); return false; @@ -137,7 +137,7 @@ void WifiNetAgent::UpdateNetLinkInfo(IpInfo &wifiIpInfo, IpV6Info &wifiIpV6Info, WIFI_LOGE("wifi is not avaliable, no need UpdateNetLinkInfo"); return; } - sptr netLinkInfo = (std::make_unique()).release(); + sptr netLinkInfo = sptr::MakeSptr(); if (netLinkInfo == nullptr) { WIFI_LOGE("%{public}s netLinkInfo is null", __func__); return; @@ -286,7 +286,7 @@ void WifiNetAgent::SetNetLinkIPInfo(sptr &netLi { unsigned int prefixLength = static_cast(IpTools::GetMaskLength(IpTools::ConvertIpv4Address(wifiIpInfo.netmask))); - sptr netAddr = (std::make_unique()).release(); + sptr netAddr = sptr::MakeSptr(); if (netAddr == nullptr) { WIFI_LOGE("%{public}s netAddr is null", __func__); return; @@ -298,7 +298,7 @@ void WifiNetAgent::SetNetLinkIPInfo(sptr &netLi netAddr->prefixlen_ = prefixLength; netLinkInfo->netAddrList_.push_back(*netAddr); - sptr netIpv6Addr = (std::make_unique()).release(); + sptr netIpv6Addr = sptr::MakeSptr(); if (netIpv6Addr == nullptr) { WIFI_LOGE("%{public}s netIpv6Addr is null", __func__); return; @@ -332,7 +332,7 @@ void WifiNetAgent::SetNetLinkIPInfo(sptr &netLi void WifiNetAgent::SetNetLinkDnsInfo(sptr &netLinkInfo, IpInfo &wifiIpInfo, IpV6Info &wifiIpV6Info) { - sptr dns = (std::make_unique()).release(); + sptr dns = sptr::MakeSptr(); if (dns == nullptr) { WIFI_LOGE("%{public}s dns is null", __func__); return; @@ -344,7 +344,7 @@ void WifiNetAgent::SetNetLinkDnsInfo(sptr &netL netLinkInfo->dnsList_.push_back(*dns); LOGI("SetNetLinkDnsInfo ipv4 address:%{public}s", IpAnonymize(dns->address_).c_str()); } - sptr ipv6dns = (std::make_unique()).release(); + sptr ipv6dns = sptr::MakeSptr(); if (ipv6dns == nullptr) { WIFI_LOGE("%{public}s ipv6dns is null", __func__); return; @@ -361,7 +361,7 @@ void WifiNetAgent::SetNetLinkDnsInfo(sptr &netL void WifiNetAgent::SetNetLinkRouteInfo(sptr &netLinkInfo, IpInfo &wifiIpInfo, IpV6Info &wifiIpV6Info) { - sptr route = (std::make_unique()).release(); + sptr route = sptr::MakeSptr(); if (route == nullptr) { WIFI_LOGE("%{public}s route is null", __func__); return; @@ -403,7 +403,7 @@ void WifiNetAgent::SetNetLinkRouteInfo(sptr &ne void WifiNetAgent::SetNetLinkHostRouteInfo(sptr &netLinkInfo, IpInfo &wifiIpInfo) { if ((wifiIpInfo.ipAddress & wifiIpInfo.netmask) != (wifiIpInfo.gateway & wifiIpInfo.netmask)) { - sptr hostRoute = (std::make_unique()).release(); + sptr hostRoute = sptr::MakeSptr(); if (hostRoute == nullptr) { WIFI_LOGE("%{public}s hostRoute is null", __func__); return; @@ -424,7 +424,7 @@ void WifiNetAgent::SetNetLinkLocalRouteInfo(sptr(IpTools::GetMaskLength(IpTools::ConvertIpv4Address(wifiIpInfo.netmask))); - sptr localRoute = (std::make_unique()).release(); + sptr localRoute = sptr::MakeSptr(); if (localRoute == nullptr) { WIFI_LOGE("%{public}s localRoute is null", __func__); return; @@ -440,7 +440,7 @@ void WifiNetAgent::SetNetLinkLocalRouteInfo(sptr ipv6route = (std::make_unique()).release(); + sptr ipv6route = sptr::MakeSptr(); if (ipv6route == nullptr) { WIFI_LOGE("%{public}s ipv6route is null", __func__); return;