From 1ba3fd86fd226554722db54232620faf529438e2 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 6 Oct 2013 08:20:31 +0000 Subject: misprint in service name git-svn-id: http://svn.miranda-ng.org/main/trunk@6368 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/netlib/netlibsock.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'src/modules/netlib/netlibsock.cpp') diff --git a/src/modules/netlib/netlibsock.cpp b/src/modules/netlib/netlibsock.cpp index 2611ea9f37..c88715da50 100644 --- a/src/modules/netlib/netlibsock.cpp +++ b/src/modules/netlib/netlibsock.cpp @@ -224,20 +224,17 @@ bool NetlibStringToAddress(const char* str, SOCKADDR_INET_M* addr) char* NetlibAddressToString(SOCKADDR_INET_M* addr) { char saddr[128]; - DWORD len = sizeof(saddr); if ( !WSAAddressToStringA((PSOCKADDR)addr, sizeof(*addr), NULL, saddr, &len)) return mir_strdup(saddr); - if (addr->si_family == AF_INET) - { + + if (addr->si_family == AF_INET) { char *szIp = inet_ntoa(addr->Ipv4.sin_addr); - if (addr->Ipv4.sin_port != 0) - { + if (addr->Ipv4.sin_port != 0) { mir_snprintf(saddr, sizeof(saddr), "%s:%d", szIp, htons(addr->Ipv4.sin_port)); return mir_strdup(saddr); } - else - return mir_strdup(szIp); + return mir_strdup(szIp); } return NULL; } @@ -249,8 +246,7 @@ void NetlibGetConnectionInfo(NetlibConnection* nlc, NETLIBCONNINFO *connInfo) SOCKADDR_INET_M sin = {0}; int len = sizeof(sin); - if ( !getsockname(nlc->s, (PSOCKADDR)&sin, &len)) - { + if ( !getsockname(nlc->s, (PSOCKADDR)&sin, &len)) { connInfo->wPort = ntohs(sin.Ipv4.sin_port); connInfo->dwIpv4 = sin.si_family == AF_INET ? htonl(sin.Ipv4.sin_addr.s_addr) : 0; -- cgit v1.2.3