diff options
Diffstat (limited to 'Swiften/Network/EnvironmentProxyProvider.cpp')
-rw-r--r-- | Swiften/Network/EnvironmentProxyProvider.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/Network/EnvironmentProxyProvider.cpp b/Swiften/Network/EnvironmentProxyProvider.cpp index aa8027f..faf2e5b 100644 --- a/Swiften/Network/EnvironmentProxyProvider.cpp +++ b/Swiften/Network/EnvironmentProxyProvider.cpp @@ -36,15 +36,15 @@ HostAddressPort EnvironmentProxyProvider::getSOCKS5Proxy() const { } HostAddressPort EnvironmentProxyProvider::getFromEnv(const char* envVarName, std::string proxyProtocol) { - char* envVar = NULL; + char* envVar = nullptr; std::string address; int port = 0; envVar = getenv(envVarName); proxyProtocol += "://"; - address = envVar != NULL ? envVar : "0.0.0.0"; - if(envVar != NULL && address.compare(0, proxyProtocol.length(), proxyProtocol) == 0) { + address = envVar != nullptr ? envVar : "0.0.0.0"; + if(envVar != nullptr && address.compare(0, proxyProtocol.length(), proxyProtocol) == 0) { address = address.substr(proxyProtocol.length(), address.length()); port = atoi(address.substr(address.find(':') + 1, address.length()).c_str()); address = address.substr(0, address.find(':')); |