Merge branch 'mergetool' of git://repo.or.cz/git/mergetool into maint

diff --git a/imap-send.c b/imap-send.c
index 84df2fabb7f91d30f7617dd07202ed916c5f8eb1..a5a069608419a8ecc42be63eb7998efd262f0ddc 100644 (file)
--- a/imap-send.c
+++ b/imap-send.c
@@ -224,7 +224,7 @@ socket_perror( const char *func, Socket_t *sock, int ret )
 static int
 socket_read( Socket_t *sock, char *buf, int len )
 {
-       int n = xread( sock->fd, buf, len );
+       ssize_t n = xread( sock->fd, buf, len );
        if (n <= 0) {
                socket_perror( "read", sock, n );
                close( sock->fd );
@@ -1239,7 +1239,7 @@ split_msg( msg_data_t *all_msgs, msg_data_t *msg, int *ofs )
        msg->data[ msg->len ] = 0;
 
        *ofs += msg->len;
-       return 1;
+       return 1;
 }
 
 static imap_server_conf_t server =