Mercurial > dovecot > core-2.2
changeset 21212:09ea38867c8c
global: Avoid unnecessary unsigned integer wraps.
Avoids complains from clang -fsanitize=integer
| author | Timo Sirainen <timo.sirainen@dovecot.fi> |
|---|---|
| date | Sat, 19 Nov 2016 02:00:25 +0200 |
| parents | 2d5f8e678f7c |
| children | 10a77a6881cd |
| files | src/indexer/master-connection.c src/lib-mail/test-istream-header-filter.c src/lib-storage/index/mbox/istream-raw-mbox.c |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/indexer/master-connection.c Sat Nov 19 01:59:03 2016 +0200 +++ b/src/indexer/master-connection.c Sat Nov 19 02:00:25 2016 +0200 @@ -88,7 +88,7 @@ metadata.precache_fields, NULL); mail_search_args_unref(&search_args); - max = status.messages - seq + 1; + max = status.messages + 1 - seq; while (mailbox_search_next(ctx, &mail)) { mail_precache(mail); if (++counter % 100 == 0) {
--- a/src/lib-mail/test-istream-header-filter.c Sat Nov 19 01:59:03 2016 +0200 +++ b/src/lib-mail/test-istream-header-filter.c Sat Nov 19 02:00:25 2016 +0200 @@ -499,7 +499,7 @@ for (i = 0; i < N_ELEMENTS(tests); i++) { istream = test_istream_create(tests[i].input); test_istream_run(istream, - strlen(tests[i].input) + tests[i].extra, + (int)strlen(tests[i].input) + tests[i].extra, tests[i].output, HEADER_FILTER_EXCLUDE | HEADER_FILTER_CRLF_PRESERVE |
--- a/src/lib-storage/index/mbox/istream-raw-mbox.c Sat Nov 19 01:59:03 2016 +0200 +++ b/src/lib-storage/index/mbox/istream-raw-mbox.c Sat Nov 19 02:00:25 2016 +0200 @@ -301,9 +301,9 @@ from_start_pos = i - 6; } - if (rstream->hdr_offset + rstream->mail_size == - stream->istream.v_offset + from_start_pos || - rstream->mail_size == (uoff_t)-1) { + if (rstream->mail_size == (uoff_t)-1 || + rstream->hdr_offset + rstream->mail_size == + stream->istream.v_offset + from_start_pos) { from_after_pos = i; if (ret == -2) { /* even if we don't have the