From a55354516b08efa98be7b4973691d4eb671d79bb Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Sat, 19 Mar 2011 19:40:50 +0100 Subject: [PATCH] move responsibility for closing sockets on error to user the only user being imap and the first thing in imap_cancel_store() being a call to socket_close(), this code was pretty pointless anyway. --- src/socket.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/socket.c b/src/socket.c index 7d0d24e..c8d1a57 100644 --- a/src/socket.c +++ b/src/socket.c @@ -377,8 +377,6 @@ socket_fill( conn_t *sock ) read( sock->fd, buf, len ); if (n <= 0) { socket_perror( "read", sock, n ); - close( sock->fd ); - sock->fd = -1; return -1; } else { sock->bytes += n; @@ -443,8 +441,6 @@ socket_write( conn_t *sock, char *buf, int len, ownership_t takeOwn ) free( buf ); if (n != len) { socket_perror( "write", sock, n ); - close( sock->fd ); - sock->fd = -1; return -1; } return 0;