X-Git-Url: http://git.tdb.fi/?p=libs%2Fnet.git;a=blobdiff_plain;f=source%2Fnet%2Fresolve.cpp;fp=source%2Fnet%2Fresolve.cpp;h=e06bce77775e49fdd18569d12d79fec1f9739c0b;hp=fd59cbb37ddf1cea8f1377527645262300bd42be;hb=3ab65d35cfd696002e09768a38f98e6a2e1ade81;hpb=1c300cbe77a7084951a080020361fc45bd190253

diff --git a/source/net/resolve.cpp b/source/net/resolve.cpp
index fd59cbb..e06bce7 100644
--- a/source/net/resolve.cpp
+++ b/source/net/resolve.cpp
@@ -40,16 +40,16 @@ namespace Net {
 
 SockAddr *resolve(const string &host, const string &serv, Family family)
 {
-	const char *chost = (host.empty() ? 0 : host.c_str());
-	const char *cserv = (serv.empty() ? 0 : serv.c_str());
+	const char *chost = (host.empty() ? nullptr : host.c_str());
+	const char *cserv = (serv.empty() ? nullptr : serv.c_str());
 	int flags = 0;
 	if(host=="*")
 	{
 		flags = AI_PASSIVE;
-		chost = 0;
+		chost = nullptr;
 	}
 
-	addrinfo hints = { flags, family_to_sys(family), 0, 0, 0, 0, 0, 0 };
+	addrinfo hints = { flags, family_to_sys(family), 0, 0, 0, nullptr, nullptr, nullptr };
 	addrinfo *res;
 
 	int err = getaddrinfo(chost, cserv, &hints, &res);
@@ -134,7 +134,7 @@ void Resolver::task_done()
 			if(signal_resolve_failed.empty())
 			{
 				RefPtr<runtime_error> err = task->error;
-				task->error = 0;
+				task->error = nullptr;
 				thread.pop_complete_task();
 				throw *err;
 			}
@@ -174,7 +174,7 @@ Resolver::Task *Resolver::WorkerThread::get_complete_task()
 	if(!queue.empty() && queue.front().is_complete())
 		return &queue.front();
 	else
-		return 0;
+		return nullptr;
 }
 
 void Resolver::WorkerThread::pop_complete_task()
@@ -197,7 +197,7 @@ void Resolver::WorkerThread::main()
 			sem.wait();
 		wait = false;
 
-		Task *task = 0;
+		Task *task = nullptr;
 		{
 			MutexLock lock(queue_mutex);
 			for(auto i=queue.begin(); (!task && i!=queue.end()); ++i)