From 308a5864779d1ce9a8cf5f25978b44dada062712 Mon Sep 17 00:00:00 2001 From: Paul Bakker Date: Fri, 11 Jul 2014 11:40:35 +0200 Subject: [PATCH] Better placement of memset() to prevent compiler warning under MSVC --- library/net.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/library/net.c b/library/net.c index cf4a77886..2ef1c3c18 100644 --- a/library/net.c +++ b/library/net.c @@ -113,8 +113,6 @@ int net_connect( int *fd, const char *host, int port ) struct sockaddr_in server_addr; struct hostent *server_host; - memset( &server_addr, 0, sizeof( server_addr ) ); - #if defined(_WIN32) || defined(_WIN32_WCE) WSADATA wsaData; @@ -129,6 +127,8 @@ int net_connect( int *fd, const char *host, int port ) signal( SIGPIPE, SIG_IGN ); #endif + memset( &server_addr, 0, sizeof( server_addr ) ); + if( ( server_host = gethostbyname( host ) ) == NULL ) return( POLARSSL_ERR_NET_UNKNOWN_HOST ); @@ -160,8 +160,6 @@ int net_bind( int *fd, const char *bind_ip, int port ) int n, c[4]; struct sockaddr_in server_addr; - memset( &server_addr, 0, sizeof( server_addr ) ); - #if defined(_WIN32) || defined(_WIN32_WCE) WSADATA wsaData; @@ -176,6 +174,8 @@ int net_bind( int *fd, const char *bind_ip, int port ) signal( SIGPIPE, SIG_IGN ); #endif + memset( &server_addr, 0, sizeof( server_addr ) ); + if( ( *fd = (int) socket( AF_INET, SOCK_STREAM, IPPROTO_IP ) ) < 0 ) return( POLARSSL_ERR_NET_SOCKET_FAILED );