commit 1c036ce72dc6f55a2c46f4f5675026c02b8aed86
Author: Oswald Buddenhagen <[email protected]>
Date: Sun Mar 13 13:40:39 2011 +0100
change socket_write() return code semantics
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.
src/drv_imap.c | 10 +++++-----
src/socket.c | 3 ++-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/drv_imap.c b/src/drv_imap.c
index 0342a0b..556e1cd 100644
--- a/src/drv_imap.c
+++ b/src/drv_imap.c
@@ -239,11 +239,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;
@@ -835,7 +835,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 ) < 0)
@@ -844,7 +844,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;
diff --git a/src/socket.c b/src/socket.c
index 64b1129..9d18c04 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -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
------------------------------------------------------------------------------
Xperia(TM) PLAY
It's a major breakthrough. An authentic gaming
smartphone on the nation's most reliable network.
And it wants your games.
http://p.sf.net/sfu/verizon-sfdev
_______________________________________________
isync-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/isync-devel
