lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change socket_write() return code semantics

Browse Source 
instead of returning a write()-like result, return only a binary status
code - write errors are handled internally anyway, so user code doesn't
have to check the write length.
This commit is contained in:
Oswald Buddenhagen 2011-03-13 13:40:39 +01:00
parent a85013d6ff
commit 8a72d204c9
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/drv_imap.c
View File

@ -244,11 +244,11 @@ v_submit_imap_cmd( imap_store_t *ctx, struct imap_cmd *cmd,
else
printf( ">>> %d LOGIN <user> <pass>\n", cmd->tag );
}
if (socket_write( &ctx->conn, buf, bufl ) != bufl)
if (socket_write( &ctx->conn, buf, bufl ) < 0)
goto bail;
if (litplus) {
if (socket_write( &ctx->conn, cmd->param.data, cmd->param.data_len ) != cmd->param.data_len ||
socket_write( &ctx->conn, "\r\n", 2 ) != 2)
if (socket_write( &ctx->conn, cmd->param.data, cmd->param.data_len ) < 0 ||
socket_write( &ctx->conn, "\r\n", 2 ) < 0)
goto bail;
free( cmd->param.data );
cmd->param.data = 0;
@ -842,7 +842,7 @@ get_cmd_result( imap_store_t *ctx, struct imap_cmd *tcmd )
n = socket_write( &ctx->conn, cmdp->param.data, cmdp->param.data_len );
free( cmdp->param.data );
cmdp->param.data = 0;
if (n != (int)cmdp->param.data_len)
if (n < 0)
break;
} else if (cmdp->param.cont) {
if (cmdp->param.cont( ctx, cmdp, cmd ))
@ -851,7 +851,7 @@ get_cmd_result( imap_store_t *ctx, struct imap_cmd *tcmd )
error( "IMAP error: unexpected command continuation request\n" );
break;
}
if (socket_write( &ctx->conn, "\r\n", 2 ) != 2)
if (socket_write( &ctx->conn, "\r\n", 2 ) < 0)
break;
if (!cmdp->param.cont)
ctx->literal_pending = 0;

3
src/socket.c
View File

@ -387,8 +387,9 @@ socket_write( conn_t *sock, char *buf, int len )
socket_perror( "write", sock, n );
close( sock->fd );
sock->fd = -1;
return -1;
}
return n;
return 0;
}
int