X-Git-Url: http://git.tdb.fi/?p=libs%2Fnet.git;a=blobdiff_plain;f=source%2Fstreamsocket.cpp;h=c5e19685f6f2cd615f6c34aa8532b045f7c691b2;hp=79b08f4d91541854817d75f5f975f50444a21746;hb=a81c41acd873cda7f40bca634782230d9e57dc4f;hpb=c016a1ae2bc93a48074e4b8cafab70b9d2c9fc20

diff --git a/source/streamsocket.cpp b/source/streamsocket.cpp
index 79b08f4..c5e1968 100644
--- a/source/streamsocket.cpp
+++ b/source/streamsocket.cpp
@@ -42,7 +42,7 @@ int StreamSocket::poll_connect(const Time::TimeDelta &timeout)
 	if(!connecting)
 		throw InvalidState("No connection attempt going on");
 
-	int res=poll(*this, IO::P_OUTPUT, timeout);
+	int res = poll(*this, IO::P_OUTPUT, timeout);
 	if(res==-1)
 #ifdef WIN32
 		throw Exception(format("Connection polling failed: %d", WSAGetLastError()));
@@ -51,10 +51,10 @@ int StreamSocket::poll_connect(const Time::TimeDelta &timeout)
 #endif
 	else if(res>0)
 	{
-		connecting=false;
+		connecting = false;
 
 		int err;
-		socklen_t len=sizeof(int);
+		socklen_t len = sizeof(int);
 		get_option(SOL_SOCKET, SO_ERROR, &err, &len);
 
 		if(err!=0)
@@ -72,7 +72,7 @@ int StreamSocket::poll_connect(const Time::TimeDelta &timeout)
 #endif
 		set_events(IO::P_INPUT);
 
-		connected=true;
+		connected = true;
 
 		return 0;
 	}
@@ -96,16 +96,16 @@ int StreamSocket::connect(const SockAddr &addr)
 		throw InvalidState("Socket is already connected");
 
 	sockaddr_storage sa;
-	socklen_t size=addr.fill_sockaddr(sa);
+	socklen_t size = addr.fill_sockaddr(sa);
 
 #ifdef WIN32
-	int err=WSAConnect(handle, reinterpret_cast<sockaddr *>(&sa), size, 0, 0, 0, 0);
+	int err = WSAConnect(handle, reinterpret_cast<sockaddr *>(&sa), size, 0, 0, 0, 0);
 	if(err==SOCKET_ERROR)
 	{
-		int err_code=WSAGetLastError();
+		int err_code = WSAGetLastError();
 		if(err_code==WSAEWOULDBLOCK)
 		{
-			connecting=true;
+			connecting = true;
 			WSAEventSelect(handle, event, FD_CONNECT);
 			set_events(IO::P_OUTPUT);
 		}
@@ -113,12 +113,12 @@ int StreamSocket::connect(const SockAddr &addr)
 			throw Exception(format("Unable to connect: %d", err_code));
 	}
 #else
-	int err=::connect(handle, reinterpret_cast<sockaddr *>(&sa), size);
+	int err = ::connect(handle, reinterpret_cast<sockaddr *>(&sa), size);
 	if(err==-1)
 	{
 		if(errno==EINPROGRESS)
 		{
-			connecting=true;
+			connecting = true;
 			set_events(IO::P_OUTPUT);
 		}
 		else
@@ -127,16 +127,16 @@ int StreamSocket::connect(const SockAddr &addr)
 #endif
 
 	delete peer_addr;
-	peer_addr=addr.copy();
+	peer_addr = addr.copy();
 
 	delete local_addr;
-	size=sizeof(sockaddr_storage);
+	size = sizeof(sockaddr_storage);
 	getsockname(handle, reinterpret_cast<sockaddr *>(&sa), &size);
-	local_addr=SockAddr::create(sa);
+	local_addr = SockAddr::create(sa);
 
 	if(err==0)
 	{
-		connected=true;
+		connected = true;
 		set_events(IO::P_INPUT);
 		signal_connect_finished.emit(0);
 	}
@@ -150,17 +150,17 @@ void StreamSocket::on_event(IO::PollEvent ev)
 	if((ev&(IO::P_OUTPUT|IO::P_ERROR)) && connecting)
 	{
 		int err;
-		socklen_t len=sizeof(err);
+		socklen_t len = sizeof(err);
 		get_option(SOL_SOCKET, SO_ERROR, &err, &len);
 
-		connecting=false;
-		connected=(err==0);
+		connecting = false;
+		connected = (err==0);
 		signal_connect_finished.emit(err);
 
 		if(err!=0)
 		{
 			delete peer_addr;
-			peer_addr=0;
+			peer_addr = 0;
 		}
 
 #ifdef WIN32