oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

system/Resolver: use nullptr instead of NULL

Browse Source
This commit is contained in:
Max Kellermann 2014-07-30 18:44:40 +02:00
parent 37d6cc07a7
commit 664fc76ac7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/system/Resolver.cxx
View File

@ -85,7 +85,7 @@ sockaddr_to_string(const struct sockaddr *sa, size_t length)
return "unknown"; return "unknown";
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
if (strchr(host, ':') != NULL) { if (strchr(host, ':') != nullptr) {
std::string result("["); std::string result("[");
result.append(host); result.append(host);
result.append("]:"); result.append("]:");
@ -121,7 +121,7 @@ resolve_host_port(const char *host_port, unsigned default_port,
} }
} }
if (port == NULL) { if (port == nullptr) {
/* port is after the colon, but only if it's the only /* port is after the colon, but only if it's the only
colon (don't split IPv6 addresses) */ colon (don't split IPv6 addresses) */
@ -134,13 +134,13 @@ resolve_host_port(const char *host_port, unsigned default_port,
} }
char buffer[32]; char buffer[32];
if (port == NULL && default_port != 0) { if (port == nullptr && default_port != 0) {
snprintf(buffer, sizeof(buffer), "%u", default_port); snprintf(buffer, sizeof(buffer), "%u", default_port);
port = buffer; port = buffer;
} }
if ((flags & AI_PASSIVE) != 0 && strcmp(host, "*") == 0) if ((flags & AI_PASSIVE) != 0 && strcmp(host, "*") == 0)
host = NULL; host = nullptr;
addrinfo hints; addrinfo hints;
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));
@ -154,7 +154,7 @@ resolve_host_port(const char *host_port, unsigned default_port,
error.Format(resolver_domain, ret, error.Format(resolver_domain, ret,
"Failed to look up '%s': %s", "Failed to look up '%s': %s",
host_port, gai_strerror(ret)); host_port, gai_strerror(ret));
return NULL; return nullptr;
} }
return ai; return ai;