global: don't cast NULL to void *

NULL is guaranteed to be a void * thanks to
dd6043c05e32a8e8db1233ed711a2c74d1477a89.

diff --git a/src/anvil/main.c b/src/anvil/main.c
index 944b98096c6f7442d6b61b3e6d7fdf602a9df0a6..e1a4062f8026bb28b7b2e062d3d4cfa05fd33367 100644 (file)
--- a/src/anvil/main.c
+++ b/src/anvil/main.c
@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
        connect_limit = connect_limit_init();
        penalty = penalty_init();
        log_fdpass_io = io_add(MASTER_ANVIL_LOG_FDPASS_FD, IO_READ,
-                              log_fdpass_input, (void *)NULL);
+                              log_fdpass_input, NULL);
        master_service_init_finish(master_service);
 
        master_service_run(master_service, client_connected);

diff --git a/src/auth/auth-request-handler.c b/src/auth/auth-request-handler.c
index a8f505128e63172657a9fe37d1069212bfd8b558..06bcb902462b80cdf5f7f61ef681d56f31ad5a65 100644 (file)
--- a/src/auth/auth-request-handler.c
+++ b/src/auth/auth-request-handler.c
@@ -241,7 +241,7 @@ auth_request_handle_failure(struct auth_request *request, const char *reply)
        if (to_auth_failures == NULL) {
                to_auth_failures =
                        timeout_add_short(AUTH_FAILURE_DELAY_CHECK_MSECS,
-                                         auth_failure_timeout, (void *)NULL);
+                                         auth_failure_timeout, NULL);
        }
 }
 

diff --git a/src/auth/userdb-passwd.c b/src/auth/userdb-passwd.c
index e294c181ede1b2d827b93929fa8a8b2bb6997021..03cbd554ffa7b4e23b573e5d850c6d0c7120879d 100644 (file)
--- a/src/auth/userdb-passwd.c
+++ b/src/auth/userdb-passwd.c
@@ -204,7 +204,7 @@ static int passwd_iterate_deinit(struct userdb_iterate_context *_ctx)
 
        if (cur_userdb_iter != NULL) {
                cur_userdb_iter_to = timeout_add(0, passwd_iterate_next_timeout,
-                                                (void *)NULL);
+                                                NULL);
        }
        return ret;
 }

diff --git a/src/director/director-test.c b/src/director/director-test.c
index 43a4e57f31b4c6a9f0512ad2a39ee63e38067553..f8cf9e7cee82808d4218f6b704f51c2bfdc63334 100644 (file)
--- a/src/director/director-test.c
+++ b/src/director/director-test.c
@@ -541,7 +541,7 @@ static void main_init(const char *admin_path)
 
        to_disconnect =
                timeout_add(1000 * i_rand_minmax(5, 5 + DIRECTOR_DISCONNECT_TIMEOUT_SECS - 1),
-                           director_connection_disconnect_timeout, (void *)NULL);
+                           director_connection_disconnect_timeout, NULL);
 }
 
 static void main_deinit(void)

diff --git a/src/director/main.c b/src/director/main.c
index be35e3642f3be070ec91f182715c73293adee382..46ba6e8c756369b26f042ec0e6e4044b89b46b30 100644 (file)
--- a/src/director/main.c
+++ b/src/director/main.c
@@ -270,7 +270,7 @@ static void main_preinit(void)
        if (master_service_settings_get(master_service)->verbose_proctitle) {
                to_proctitle_refresh =
                        timeout_add(1000, director_refresh_proctitle_timeout,
-                                   (void *)NULL);
+                                   NULL);
        }
        set = master_service_settings_get_others(master_service)[0];
 

diff --git a/src/imap/imap-fetch-body.c b/src/imap/imap-fetch-body.c
index b79ebce9c3a78693986bc643f23bcc206738d87f..70747e85f0568bb4467c5128c8de6304168d7ad6 100644 (file)
--- a/src/imap/imap-fetch-body.c
+++ b/src/imap/imap-fetch-body.c
@@ -561,27 +561,27 @@ bool imap_fetch_rfc822_init(struct imap_fetch_init_context *ctx)
                        MAIL_FETCH_STREAM_BODY;
                ctx->fetch_ctx->flags_update_seen = TRUE;
                imap_fetch_add_handler(ctx, 0, "NIL",
-                                      fetch_rfc822, (void *)NULL);
+                                      fetch_rfc822, NULL);
                return TRUE;
        }
 
        if (strcmp(name+6, ".SIZE") == 0) {
                ctx->fetch_ctx->fetch_data |= MAIL_FETCH_VIRTUAL_SIZE;
                imap_fetch_add_handler(ctx, IMAP_FETCH_HANDLER_FLAG_BUFFERED,
-                                      "0", fetch_rfc822_size, (void *)NULL);
+                                      "0", fetch_rfc822_size, NULL);
                return TRUE;
        }
        if (strcmp(name+6, ".HEADER") == 0) {
                ctx->fetch_ctx->fetch_data |= MAIL_FETCH_STREAM_HEADER;
                imap_fetch_add_handler(ctx, 0, "NIL",
-                                      fetch_rfc822_header, (void *)NULL);
+                                      fetch_rfc822_header, NULL);
                return TRUE;
        }
        if (strcmp(name+6, ".TEXT") == 0) {
                ctx->fetch_ctx->fetch_data |= MAIL_FETCH_STREAM_BODY;
                ctx->fetch_ctx->flags_update_seen = TRUE;
                imap_fetch_add_handler(ctx, 0, "NIL",
-                                      fetch_rfc822_text, (void *)NULL);
+                                      fetch_rfc822_text, NULL);
                return TRUE;
        }
 

diff --git a/src/lib-http/test-http-client-errors.c b/src/lib-http/test-http-client-errors.c
index 3ccc6b504dc7cc81220ac241127ece62eb90962e..9933a13abdd7033758836c3325542efaed5e2dd7 100644 (file)
--- a/src/lib-http/test-http-client-errors.c
+++ b/src/lib-http/test-http-client-errors.c
@@ -3051,7 +3051,7 @@ static void test_server_run(unsigned int index)
 
        /* open server socket */
        io_listen = io_add(fd_listen,
-               IO_READ, server_connection_accept, (void *)NULL);
+               IO_READ, server_connection_accept, NULL);
 
        server_conn_list = connection_list_init
                (&server_connection_set, &server_connection_vfuncs);

diff --git a/src/lib-http/test-http-payload.c b/src/lib-http/test-http-payload.c
index 0b0760f7d5ded4f903e55c2f629a279e92395da6..45cc163cae0812d6272750d7e4cc0fbf830cdf0b 100644 (file)
--- a/src/lib-http/test-http-payload.c
+++ b/src/lib-http/test-http-payload.c
@@ -606,7 +606,7 @@ test_server_init(const struct http_server_settings *server_set)
 {
        /* open server socket */
        io_listen = io_add(fd_listen,
-               IO_READ, client_accept, (void *)NULL);
+               IO_READ, client_accept, NULL);
 
        http_server = http_server_init(server_set);
 }

diff --git a/src/lib-http/test-http-server-errors.c b/src/lib-http/test-http-server-errors.c
index 492a581483d5f10b560021a08f589238f7abe835..0771a0a8c565f82841876292c5dc34090ee6708f 100644 (file)
--- a/src/lib-http/test-http-server-errors.c
+++ b/src/lib-http/test-http-server-errors.c
@@ -738,7 +738,7 @@ test_server_run(const struct http_server_settings *http_set)
 
        /* open server socket */
        io_listen = io_add(fd_listen,
-               IO_READ, server_connection_accept, (void *)NULL);
+               IO_READ, server_connection_accept, NULL);
 
        http_server = http_server_init(http_set);
 

diff --git a/src/lib-http/test-http-server.c b/src/lib-http/test-http-server.c
index b9f2452ce24ac8fb253c1a89616e64c39dee3a5a..ceec5ce2667615ccd1cebe9671def0fb185808e0 100644 (file)
--- a/src/lib-http/test-http-server.c
+++ b/src/lib-http/test-http-server.c
@@ -229,7 +229,7 @@ int main(int argc, char *argv[])
        if (fd_listen == -1)
                i_fatal("listen(port=%u) failed: %m", port);
 
-       io_listen = io_add(fd_listen, IO_READ, client_accept, (void *)NULL);
+       io_listen = io_add(fd_listen, IO_READ, client_accept, NULL);
 
        io_loop_run(ioloop);
 

diff --git a/src/lib-imap-storage/imap-msgpart.c b/src/lib-imap-storage/imap-msgpart.c
index 6c413a2ac7a5769a0dd482d99914bd372544c4df..9e38fbf9fa7ec95e28dc9268f5900a916286ead0 100644 (file)
--- a/src/lib-imap-storage/imap-msgpart.c
+++ b/src/lib-imap-storage/imap-msgpart.c
@@ -382,7 +382,7 @@ imap_msgpart_get_partial_header(struct mail *mail, struct istream *mail_input,
                                                      HEADER_FILTER_HIDE_BODY,
                                                      hdr_fields, hdr_count,
                                                      *null_header_filter_callback,
-                                                     (void *)NULL);
+                                                     NULL);
        } else if (msgpart->section_number[0] != '\0') {
                /* fetching partial headers for a message/rfc822 part. */
                input = i_stream_create_header_filter(mail_input,
@@ -390,7 +390,7 @@ imap_msgpart_get_partial_header(struct mail *mail, struct istream *mail_input,
                                                      HEADER_FILTER_HIDE_BODY,
                                                      hdr_fields, hdr_count,
                                                      *null_header_filter_callback,
-                                                     (void *)NULL);
+                                                     NULL);
        } else {
                /* mail_get_header_stream() already filtered out the
                   unwanted headers. */

diff --git a/src/lib-index/mail-index-alloc-cache.c b/src/lib-index/mail-index-alloc-cache.c
index b7c8e84b43bd48e727354b7824b7a096ef0a3526..d39db759924239e31a16785ee82d6ead565e85aa 100644 (file)
--- a/src/lib-index/mail-index-alloc-cache.c
+++ b/src/lib-index/mail-index-alloc-cache.c
@@ -238,7 +238,7 @@ void mail_index_alloc_cache_unref(struct mail_index **_index)
                mail_index_alloc_cache_list_free(list);
        } else if (to_index == NULL) {
                to_index = timeout_add(INDEX_CACHE_TIMEOUT*1000/2,
-                                      index_removal_timeout, (void *)NULL);
+                                      index_removal_timeout, NULL);
        }
 }
 

diff --git a/src/lib-lda/mail-send.c b/src/lib-lda/mail-send.c
index 703a8198511327c5366436970158913a7071ce23..2e9eca6d5c450929ca07fb51e951c6973cca77d5 100644 (file)
--- a/src/lib-lda/mail-send.c
+++ b/src/lib-lda/mail-send.c
@@ -196,7 +196,7 @@ int mail_send_rejection(struct mail_deliver_context *ctx,
                        HEADER_FILTER_EXCLUDE | HEADER_FILTER_NO_CR |
                        HEADER_FILTER_HIDE_BODY, exclude_headers,
                        N_ELEMENTS(exclude_headers),
-                       *null_header_filter_callback, (void *)NULL);
+                       *null_header_filter_callback, NULL);
 
                o_stream_nsend_istream(output, input);
                i_stream_unref(&input);

diff --git a/src/lib-mail/test-istream-header-filter.c b/src/lib-mail/test-istream-header-filter.c
index c4db34d81ad2579a2b520261571e313af86a44cb..9ffea857921ed61ba52e481ab9079be1e2cca261 100644 (file)
--- a/src/lib-mail/test-istream-header-filter.c
+++ b/src/lib-mail/test-istream-header-filter.c
@@ -144,14 +144,14 @@ static void test_istream_filter(void)
                                               HEADER_FILTER_NO_CR,
                                               exclude_headers,
                                               N_ELEMENTS(exclude_headers),
-                                              filter_callback, (void *)NULL);
+                                              filter_callback, NULL);
        filter2 = i_stream_create_header_filter(filter,
                                                HEADER_FILTER_EXCLUDE |
                                                HEADER_FILTER_NO_CR,
                                                exclude_headers,
                                                N_ELEMENTS(exclude_headers),
                                                *null_header_filter_callback,
-                                               (void *)NULL);
+                                               NULL);
        i_stream_unref(&filter);
        filter = filter2;
 
@@ -307,7 +307,7 @@ static void test_istream_filter_large_buffer2(void)
        filter = i_stream_create_header_filter(istream,
                HEADER_FILTER_INCLUDE | HEADER_FILTER_HIDE_BODY,
                wanted_headers, N_ELEMENTS(wanted_headers),
-               *null_header_filter_callback, (void *)NULL);
+               *null_header_filter_callback, NULL);
 
        for (i = 0; i < 2; i++) {
                while ((ret = i_stream_read_more(filter, &data, &size)) > 0) {
@@ -449,7 +449,7 @@ static void test_istream_end_body_with_lf(void)
                                               HEADER_FILTER_END_BODY_WITH_LF,
                                               NULL, 0,
                                               *null_header_filter_callback,
-                                              (void *)NULL);
+                                              NULL);
 
        for (i = 1; i < input_len; i++) {
                test_istream_set_size(istream, i);

diff --git a/src/lib-smtp/test-smtp-client-errors.c b/src/lib-smtp/test-smtp-client-errors.c
index 7e999062f085053be075a71a088a3dbf878ca62a..dbdb428cbeec06a99f1de4bfecc9ae5643e5ca93 100644 (file)
--- a/src/lib-smtp/test-smtp-client-errors.c
+++ b/src/lib-smtp/test-smtp-client-errors.c
@@ -2760,7 +2760,7 @@ static void test_server_run(unsigned int index)
 
        /* open server socket */
        io_listen = io_add(fd_listen,
-               IO_READ, server_connection_accept, (void *)NULL);
+               IO_READ, server_connection_accept, NULL);
 
        server_conn_list = connection_list_init
                (&server_connection_set, &server_connection_vfuncs);

diff --git a/src/lib-smtp/test-smtp-payload.c b/src/lib-smtp/test-smtp-payload.c
index 1d0920cb67b034936c01f50430dd415cdf7799b4..738fdf59d55860e470ed31c27770ce605674a889 100644 (file)
--- a/src/lib-smtp/test-smtp-payload.c
+++ b/src/lib-smtp/test-smtp-payload.c
@@ -437,7 +437,7 @@ test_server_init(const struct smtp_server_settings *server_set)
 {
        /* open server socket */
        io_listen = io_add(fd_listen,
-               IO_READ, client_accept, (void *)NULL);
+               IO_READ, client_accept, NULL);
 
        smtp_server = smtp_server_init(server_set);
 }

diff --git a/src/lib-smtp/test-smtp-server-errors.c b/src/lib-smtp/test-smtp-server-errors.c
index 8ab6ba519ab7ad9fb83ff23835343e44981cd5aa..128efcbcb1b22a3f41ca674f0d30be6dac8efe18 100644 (file)
--- a/src/lib-smtp/test-smtp-server-errors.c
+++ b/src/lib-smtp/test-smtp-server-errors.c
@@ -1187,7 +1187,7 @@ test_server_run(const struct smtp_server_settings *smtp_set)
 
        /* open server socket */
        io_listen = io_add(fd_listen,
-               IO_READ, server_connection_accept, (void *)NULL);
+               IO_READ, server_connection_accept, NULL);
 
        smtp_server = smtp_server_init(smtp_set);
 

diff --git a/src/lib-smtp/test-smtp-submit.c b/src/lib-smtp/test-smtp-submit.c
index ef619f0300b3099b361007ca5e0a6208b29c3fe6..3226d4fb65acc291231ae12716af34887eb53ab9 100644 (file)
--- a/src/lib-smtp/test-smtp-submit.c
+++ b/src/lib-smtp/test-smtp-submit.c
@@ -1926,7 +1926,7 @@ static void test_server_run(unsigned int index)
 
        /* open server socket */
        io_listen = io_add(fd_listen,
-               IO_READ, server_connection_accept, (void *)NULL);
+               IO_READ, server_connection_accept, NULL);
 
        server_conn_list = connection_list_init
                (&server_connection_set, &server_connection_vfuncs);

diff --git a/src/lib-storage/index/imapc/imapc-mail-fetch.c b/src/lib-storage/index/imapc/imapc-mail-fetch.c
index 1d4465daad3cc829106904dcdb06e1d2d086f806..30a5df9a82c7d7cbf6c3a56459239f7a3428d1f3 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-mail-fetch.c
+++ b/src/lib-storage/index/imapc/imapc-mail-fetch.c
@@ -547,7 +547,7 @@ static void imapc_stream_filter(struct istream **input)
        filter_input = i_stream_create_header_filter(*input,
                HEADER_FILTER_EXCLUDE,
                imapc_hide_headers, N_ELEMENTS(imapc_hide_headers),
-               *null_header_filter_callback, (void *)NULL);
+               *null_header_filter_callback, NULL);
        i_stream_unref(input);
        *input = filter_input;
 }

diff --git a/src/lib-storage/index/index-mail-binary.c b/src/lib-storage/index/index-mail-binary.c
index 61c0a671286fc9b07f263f1bccbc3eef77cb514e..4c552677f4536d2c763ccef9be81beaee25194ac 100644 (file)
--- a/src/lib-storage/index/index-mail-binary.c
+++ b/src/lib-storage/index/index-mail-binary.c
@@ -143,7 +143,7 @@ add_binary_part(struct binary_ctx *ctx, const struct message_part *part,
                block->input = i_stream_create_header_filter(linput,
                                HEADER_FILTER_EXCLUDE | HEADER_FILTER_HIDE_BODY,
                                filter_headers, N_ELEMENTS(filter_headers),
-                               binary_cte_filter_callback, (void *)NULL);
+                               binary_cte_filter_callback, NULL);
                i_stream_unref(&linput);
        } else {
                /* copy everything as-is until the end of this header */

diff --git a/src/lib-storage/index/index-mail.c b/src/lib-storage/index/index-mail.c
index b47d4afb370f523e6a1fac022039cba2a3c3cc73..44f1116b4003e23927493c8a24e2716648d612ed 100644 (file)
--- a/src/lib-storage/index/index-mail.c
+++ b/src/lib-storage/index/index-mail.c
@@ -1176,7 +1176,7 @@ static int index_mail_parse_body(struct index_mail *mail,
                                          mail->mail.data_pool);
        } else {
                message_parser_parse_body(data->parser_ctx,
-                       *null_message_part_header_callback, (void *)NULL);
+                       *null_message_part_header_callback, NULL);
        }
        ret = index_mail_stream_check_failure(mail);
        if (index_mail_parse_body_finish(mail, field, TRUE) < 0)

diff --git a/src/lib-storage/index/index-search.c b/src/lib-storage/index/index-search.c
index 8e12b96d1f4bc0979e4fad0e42e6726fa1609fde..b7fac19eb4f067a494d573aa93b67bc19bffcb4f 100644 (file)
--- a/src/lib-storage/index/index-search.c
+++ b/src/lib-storage/index/index-search.c
@@ -812,7 +812,7 @@ static int search_arg_match_text(struct mail_search_arg *args,
 
        if (have_headers) {
                /* see if the header search succeeded in finishing the search */
-               ret = mail_search_args_foreach(args, search_none, (void *)NULL);
+               ret = mail_search_args_foreach(args, search_none, NULL);
                if (ret >= 0 || !have_body)
                        return ret;
        }

diff --git a/src/lib-storage/index/mbox/mbox-mail.c b/src/lib-storage/index/mbox/mbox-mail.c
index e6e12c50a43c2a8a1e31036547e4acdc59d06981..0b183a8ce1e340129578e567ca4e844f9185e5c8 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-mail.c
+++ b/src/lib-storage/index/mbox/mbox-mail.c
@@ -365,7 +365,7 @@ static int mbox_mail_init_stream(struct index_mail *mail)
                i_stream_create_header_filter(raw_stream,
                                HEADER_FILTER_EXCLUDE | HEADER_FILTER_NO_CR,
                                mbox_hide_headers, mbox_hide_headers_count,
-                               *null_header_filter_callback, (void *)NULL);
+                               *null_header_filter_callback, NULL);
        i_stream_unref(&raw_stream);
        return 0;
 }

diff --git a/src/lib/lib-signals.c b/src/lib/lib-signals.c
index adecc908ade8c791a6be5b14b55cd8d283317f3b..af2069aef6354201a2156f12d217fdf181010d3b 100644 (file)
--- a/src/lib/lib-signals.c
+++ b/src/lib/lib-signals.c
@@ -300,7 +300,7 @@ lib_signals_enable_delayed_hander(void)
 {
        if (current_ioloop != NULL) {
                io_sig = io_add(sig_pipe_fd[0], IO_READ,
-                       signal_read, (void *)NULL);
+                       signal_read, NULL);
        }
 }
 

diff --git a/src/lib/test-ioloop.c b/src/lib/test-ioloop.c
index bd2fb98d805c1f7cca104c66ac4a54ccffef6eef..703efa22c6d79c7fbdbe48d3183be2d1a6b7fc75 100644 (file)
--- a/src/lib/test-ioloop.c
+++ b/src/lib/test-ioloop.c
@@ -155,9 +155,9 @@ static void test_ioloop_find_fd_conditions(void)
        for (i = 0; i < N_ELEMENTS(tests); i++) {
                if (socketpair(AF_UNIX, SOCK_STREAM, 0, tests[i].fd) < 0)
                        i_fatal("socketpair() failed: %m");
-               tests[i].io = io_add(tests[i].fd[0], tests[i].condition, io_callback, (void *)NULL);
+               tests[i].io = io_add(tests[i].fd[0], tests[i].condition, io_callback, NULL);
        }
-       io = io_add(tests[i-1].fd[0], IO_WRITE, io_callback, (void *)NULL);
+       io = io_add(tests[i-1].fd[0], IO_WRITE, io_callback, NULL);
        tests[i-1].condition |= IO_WRITE;
 
        for (i = 0; i < N_ELEMENTS(tests); i++)

diff --git a/src/replication/replicator/replicator.c b/src/replication/replicator/replicator.c
index 8a2f6ae6a477839d397c0b9cc29d9d6b844503be..b5074d348110c2502531a977aba13e258635439e 100644 (file)
--- a/src/replication/replicator/replicator.c
+++ b/src/replication/replicator/replicator.c
@@ -64,7 +64,7 @@ static void main_init(void)
                                      REPLICATOR_FAILURE_RESYNC_INTERVAL_SECS);
        replication_add_users(queue);
        to_dump = timeout_add(REPLICATOR_DB_DUMP_INTERVAL_MSECS,
-                             replicator_dump_timeout, (void *)NULL);
+                             replicator_dump_timeout, NULL);
        brain = replicator_brain_init(queue, set);
        doveadm_connections_init();
 }