bytemark/flexnbd-c
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Turn a couple of FIXME fatals in readwrite.c into warnings

Browse Source
This commit is contained in:
nick
2013-02-28 12:07:21 +00:00
parent e659a78855
commit 1d9f055dc7
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/readwrite.c
View File

@@ -17,16 +17,20 @@ int socket_connect(struct sockaddr* to, struct sockaddr* from)
} }
if (NULL != from) { if (NULL != from) {
if ( 0 > bind(fd, from, sizeof(struct sockaddr_in6)) ){ if ( 0 > bind( fd, from, sizeof(struct sockaddr_in6 ) ) ){
warn( "bind() failed"); warn( SHOW_ERRNO( "bind() to source address failed" ) );
FATAL_IF_NEGATIVE( close( fd ), SHOW_ERRNO( "FIXME" ) ); if ( 0 > close( fd ) ) { /* Non-fatal leak */
warn( SHOW_ERRNO( "Failed to close fd %i", fd ) );
}
return -1; return -1;
} }
} }
if ( 0 > sock_try_connect( fd, to, sizeof( struct sockaddr_in6 ), 15 ) ) { if ( 0 > sock_try_connect( fd, to, sizeof( struct sockaddr_in6 ), 15 ) ) {
warn( SHOW_ERRNO( "connect failed" ) ); warn( SHOW_ERRNO( "connect failed" ) );
FATAL_IF_NEGATIVE( close( fd ), SHOW_ERRNO( "FIXME" ) ); if ( 0 > close( fd ) ) { /* Non-fatal leak */
warn( SHOW_ERRNO( "Failed to close fd %i", fd ) );
}
return -1; return -1;
} }