global: Use i_realloc_type() wherever possible

diff --git a/src/lib-index/mail-cache-fields.c b/src/lib-index/mail-cache-fields.c
index cd23a42d969c06a4248ea07c400d720a95e4351c..05c3771f627f9980422a70e637f23fdb1483a350 100644 (file)
--- a/src/lib-index/mail-cache-fields.c
+++ b/src/lib-index/mail-cache-fields.c
@@ -133,13 +133,12 @@ void mail_cache_register_fields(struct mail_cache *cache,
                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 @@ int mail_cache_header_fields_read(struct mail_cache *cache)
        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);
        }

diff --git a/src/lib-index/mail-cache-transaction.c b/src/lib-index/mail-cache-transaction.c
index d2c99c0f5c6fccbd54c837ad92b4b19b335b3c19..c582241fe89083bacde73225fb4e045a49a5099f 100644 (file)
--- a/src/lib-index/mail-cache-transaction.c
+++ b/src/lib-index/mail-cache-transaction.c
@@ -606,10 +606,10 @@ static int mail_cache_header_add_field(struct mail_cache_transaction_ctx *ctx,
        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;

diff --git a/src/lib/ioloop-poll.c b/src/lib/ioloop-poll.c
index 5bee2e31710fae6b47380f6b44d7512eafde8eb8..b4bfc46424d33cb9be7753350f9c9d7413a1d797 100644 (file)
--- a/src/lib/ioloop-poll.c
+++ b/src/lib/ioloop-poll.c
@@ -55,9 +55,8 @@ void io_loop_handle_add(struct io_file *io)
 
                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 @@ void io_loop_handle_add(struct io_file *io)
 
                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) {