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.
This commit is contained in:
parent
802c99edcf
commit
a55354516b
|
@ -377,8 +377,6 @@ socket_fill( conn_t *sock )
|
||||||
read( sock->fd, buf, len );
|
read( sock->fd, buf, len );
|
||||||
if (n <= 0) {
|
if (n <= 0) {
|
||||||
socket_perror( "read", sock, n );
|
socket_perror( "read", sock, n );
|
||||||
close( sock->fd );
|
|
||||||
sock->fd = -1;
|
|
||||||
return -1;
|
return -1;
|
||||||
} else {
|
} else {
|
||||||
sock->bytes += n;
|
sock->bytes += n;
|
||||||
|
@ -443,8 +441,6 @@ socket_write( conn_t *sock, char *buf, int len, ownership_t takeOwn )
|
||||||
free( buf );
|
free( buf );
|
||||||
if (n != len) {
|
if (n != len) {
|
||||||
socket_perror( "write", sock, n );
|
socket_perror( "write", sock, n );
|
||||||
close( sock->fd );
|
|
||||||
sock->fd = -1;
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user