Mercurial > dovecot > core-2.2
changeset 22140:8089604afa5a
global: Use i_realloc_type() wherever possible
author | Timo Sirainen <timo.sirainen@dovecot.fi> |
---|---|
date | Wed, 07 Jun 2017 11:35:18 +0300 |
parents | df6a5fba9405 |
children | a37bfca0d2e4 |
files | src/lib-index/mail-cache-fields.c src/lib-index/mail-cache-transaction.c src/lib/ioloop-poll.c |
diffstat | 3 files changed, 15 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-index/mail-cache-fields.c Wed Jun 07 11:24:38 2017 +0300 +++ b/src/lib-index/mail-cache-fields.c Wed Jun 07 11:35:18 2017 +0300 @@ -133,13 +133,12 @@ return; /* @UNSAFE */ - cache->fields = i_realloc(cache->fields, - cache->fields_count * sizeof(*cache->fields), - new_idx * sizeof(*cache->fields)); + cache->fields = i_realloc_type(cache->fields, + struct mail_cache_field_private, + cache->fields_count, new_idx); cache->field_file_map = - i_realloc(cache->field_file_map, - cache->fields_count * sizeof(*cache->field_file_map), - new_idx * sizeof(*cache->field_file_map)); + i_realloc_type(cache->field_file_map, uint32_t, + cache->fields_count, new_idx); registered_count = cache->fields_count; for (i = 0; i < fields_count; i++) { @@ -349,10 +348,8 @@ new_fields_count = field_hdr->fields_count; if (new_fields_count != 0) { cache->file_field_map = - i_realloc(cache->file_field_map, - cache->file_fields_count * - sizeof(unsigned int), - new_fields_count * sizeof(unsigned int)); + i_realloc_type(cache->file_field_map, unsigned int, + cache->file_fields_count, new_fields_count); } else { i_free_and_null(cache->file_field_map); }
--- a/src/lib-index/mail-cache-transaction.c Wed Jun 07 11:24:38 2017 +0300 +++ b/src/lib-index/mail-cache-transaction.c Wed Jun 07 11:35:18 2017 +0300 @@ -606,10 +606,10 @@ if (MAIL_INDEX_IS_IN_MEMORY(cache->index)) { if (cache->file_fields_count <= field_idx) { cache->file_field_map = - i_realloc(cache->file_field_map, - cache->file_fields_count * - sizeof(unsigned int), - (field_idx+1) * sizeof(unsigned int)); + i_realloc_type(cache->file_field_map, + unsigned int, + cache->file_fields_count, + field_idx+1); cache->file_fields_count = field_idx+1; } cache->file_field_map[field_idx] = field_idx;
--- a/src/lib/ioloop-poll.c Wed Jun 07 11:24:38 2017 +0300 +++ b/src/lib/ioloop-poll.c Wed Jun 07 11:35:18 2017 +0300 @@ -55,9 +55,8 @@ ctx->idx_count = nearest_power((unsigned int) fd+1); - ctx->fd_index = i_realloc(ctx->fd_index, - sizeof(int) * old_count, - sizeof(int) * ctx->idx_count); + ctx->fd_index = i_realloc_type(ctx->fd_index, int, + old_count, ctx->idx_count); memset(ctx->fd_index + old_count, 0xff, sizeof(int) * (ctx->idx_count-old_count)); } @@ -68,9 +67,8 @@ ctx->fds_count = nearest_power(ctx->fds_count+1); - ctx->fds = i_realloc(ctx->fds, - sizeof(struct pollfd) * old_count, - sizeof(struct pollfd) * ctx->fds_count); + ctx->fds = i_realloc_type(ctx->fds, struct pollfd, + old_count, ctx->fds_count); } if (ctx->fd_index[fd] != -1) {