From fb1a0c2b1e3db8d956f47de11fd37dd1cbc26105 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Sat, 28 Feb 2015 20:20:56 -0600 Subject: [PATCH] Clean up g++ warnings in repeater.cpp --- src/ca/repeater.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/ca/repeater.cpp b/src/ca/repeater.cpp index 847431d34..5e123ee2d 100644 --- a/src/ca/repeater.cpp +++ b/src/ca/repeater.cpp @@ -89,14 +89,10 @@ static const unsigned short PORT_ANY = 0u; */ static int makeSocket ( unsigned short port, bool reuseAddr, SOCKET * pSock ) { - int status; - union { - struct sockaddr_in ia; - struct sockaddr sa; - } bd; - SOCKET sock = epicsSocketCreate ( AF_INET, SOCK_DGRAM, 0 ); + if ( sock == INVALID_SOCKET ) { + *pSock = sock; return SOCKERRNO; } @@ -104,6 +100,11 @@ static int makeSocket ( unsigned short port, bool reuseAddr, SOCKET * pSock ) * no need to bind if unconstrained */ if ( port != PORT_ANY ) { + int status; + union { + struct sockaddr_in ia; + struct sockaddr sa; + } bd; memset ( (char *) &bd, 0, sizeof (bd) ); bd.ia.sin_family = AF_INET;