zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace NULL with nullptr or null in webrtc/base/.

Browse Source 
BUG=webrtc:7147

Review-Url: https://codereview.webrtc.org/2718663005
Cr-Commit-Position: refs/heads/master@{#16878}
This commit is contained in:
deadbeef
2017-02-27 14:06:41 -08:00
committed by Commit bot
parent c5da4785f3
commit 37f5ecfd8f
117 changed files with 809 additions and 836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/base/nethelpers.cc
View File

@ -43,7 +43,7 @@ int ResolveHostname(const std::string& hostname, int family,
return -1;
}
addresses->clear();
struct addrinfo* result = NULL;
struct addrinfo* result = nullptr;
struct addrinfo hints = {0};
hints.ai_family = family;
// |family| here will almost always be AF_UNSPEC, because |family| comes from
@ -64,7 +64,7 @@ int ResolveHostname(const std::string& hostname, int family,
// https://android.googlesource.com/platform/bionic/+/
// 7e0bfb511e85834d7c6cb9631206b62f82701d60/libc/netbsd/net/getaddrinfo.c#1657
hints.ai_flags = AI_ADDRCONFIG;
int ret = getaddrinfo(hostname.c_str(), NULL, &hints, &result);
int ret = getaddrinfo(hostname.c_str(), nullptr, &hints, &result);
if (ret != 0) {
return ret;
}
@ -151,7 +151,7 @@ bool HasIPv6Enabled() {
}
DWORD protbuff_size = 4096;
std::unique_ptr<char[]> protocols;
LPWSAPROTOCOL_INFOW protocol_infos = NULL;
LPWSAPROTOCOL_INFOW protocol_infos = nullptr;
int requested_protocols[2] = {AF_INET6, 0};
int err = 0;