dovecot-2.2: Fixed compiling with OSes where NULL isn't defined ...
dovecot at dovecot.org
dovecot at dovecot.org
Sun Sep 16 16:08:31 EEST 2012
details: http://hg.dovecot.org/dovecot-2.2/rev/925d4a890a9b
changeset: 15079:925d4a890a9b
user: Timo Sirainen <tss at iki.fi>
date: Sun Sep 16 16:08:18 2012 +0300
description:
Fixed compiling with OSes where NULL isn't defined as void pointer (e.g. Solaris).
diffstat:
src/anvil/main.c | 2 +-
src/auth/auth-request-handler.c | 2 +-
src/auth/userdb-passwd.c | 4 ++--
src/director/director-test.c | 2 +-
src/imap/imap-fetch-body.c | 10 ++++++----
src/lib-index/mail-index-alloc-cache.c | 2 +-
src/lib-storage/index/index-search.c | 4 ++--
src/lib/lib-signals.c | 11 +++++++----
src/replication/replicator/replicator.c | 2 +-
9 files changed, 22 insertions(+), 17 deletions(-)
diffs (166 lines):
diff -r dc1db2eedbb1 -r 925d4a890a9b src/anvil/main.c
--- a/src/anvil/main.c Sun Sep 16 16:02:22 2012 +0300
+++ b/src/anvil/main.c Sun Sep 16 16:08:18 2012 +0300
@@ -77,7 +77,7 @@
connect_limit = connect_limit_init();
penalty = penalty_init();
log_fdpass_io = io_add(MASTER_ANVIL_LOG_FDPASS_FD, IO_READ,
- log_fdpass_input, NULL);
+ log_fdpass_input, (void *)NULL);
master_service_run(master_service, client_connected);
diff -r dc1db2eedbb1 -r 925d4a890a9b src/auth/auth-request-handler.c
--- a/src/auth/auth-request-handler.c Sun Sep 16 16:02:22 2012 +0300
+++ b/src/auth/auth-request-handler.c Sun Sep 16 16:08:18 2012 +0300
@@ -236,7 +236,7 @@
if (to_auth_failures == NULL) {
to_auth_failures =
timeout_add_short(AUTH_FAILURE_DELAY_CHECK_MSECS,
- auth_failure_timeout, NULL);
+ auth_failure_timeout, (void *)NULL);
}
}
diff -r dc1db2eedbb1 -r 925d4a890a9b src/auth/userdb-passwd.c
--- a/src/auth/userdb-passwd.c Sun Sep 16 16:02:22 2012 +0300
+++ b/src/auth/userdb-passwd.c Sun Sep 16 16:08:18 2012 +0300
@@ -202,8 +202,8 @@
i_free(ctx);
if (cur_userdb_iter != NULL) {
- cur_userdb_iter_to =
- timeout_add(0, passwd_iterate_next_timeout, NULL);
+ cur_userdb_iter_to = timeout_add(0, passwd_iterate_next_timeout,
+ (void *)NULL);
}
return ret;
}
diff -r dc1db2eedbb1 -r 925d4a890a9b src/director/director-test.c
--- a/src/director/director-test.c Sun Sep 16 16:02:22 2012 +0300
+++ b/src/director/director-test.c Sun Sep 16 16:08:18 2012 +0300
@@ -542,7 +542,7 @@
to_disconnect =
timeout_add(1000*(1 + rand()%DIRECTOR_DISCONNECT_TIMEOUT_SECS),
- director_connection_disconnect_timeout, NULL);
+ director_connection_disconnect_timeout, (void *)NULL);
}
static void main_deinit(void)
diff -r dc1db2eedbb1 -r 925d4a890a9b src/imap/imap-fetch-body.c
--- a/src/imap/imap-fetch-body.c Sun Sep 16 16:02:22 2012 +0300
+++ b/src/imap/imap-fetch-body.c Sun Sep 16 16:08:18 2012 +0300
@@ -523,26 +523,28 @@
ctx->fetch_ctx->fetch_data |= MAIL_FETCH_STREAM_HEADER |
MAIL_FETCH_STREAM_BODY;
ctx->fetch_ctx->flags_update_seen = TRUE;
- imap_fetch_add_handler(ctx, 0, "NIL", fetch_rfc822, NULL);
+ imap_fetch_add_handler(ctx, 0, "NIL",
+ fetch_rfc822, (void *)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, NULL);
+ "0", fetch_rfc822_size, (void *)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, NULL);
+ fetch_rfc822_header, (void *)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, NULL);
+ imap_fetch_add_handler(ctx, 0, "NIL",
+ fetch_rfc822_text, (void *)NULL);
return TRUE;
}
diff -r dc1db2eedbb1 -r 925d4a890a9b src/lib-index/mail-index-alloc-cache.c
--- a/src/lib-index/mail-index-alloc-cache.c Sun Sep 16 16:02:22 2012 +0300
+++ b/src/lib-index/mail-index-alloc-cache.c Sun Sep 16 16:08:18 2012 +0300
@@ -206,7 +206,7 @@
mail_index_alloc_cache_list_free(list);
} else if (to_index == NULL) {
to_index = timeout_add(INDEX_CACHE_TIMEOUT*1000/2,
- index_removal_timeout, NULL);
+ index_removal_timeout, (void *)NULL);
}
}
diff -r dc1db2eedbb1 -r 925d4a890a9b src/lib-storage/index/index-search.c
--- a/src/lib-storage/index/index-search.c Sun Sep 16 16:02:22 2012 +0300
+++ b/src/lib-storage/index/index-search.c Sun Sep 16 16:08:18 2012 +0300
@@ -1205,7 +1205,7 @@
static void ATTR_NULL(2)
search_arg_deinit(struct mail_search_arg *arg,
- void *context ATTR_UNUSED)
+ struct index_search_context *ctx ATTR_UNUSED)
{
struct message_search_context *search_ctx = arg->context;
@@ -1225,7 +1225,7 @@
mail_search_args_reset(ctx->mail_ctx.args->args, FALSE);
(void)mail_search_args_foreach(ctx->mail_ctx.args->args,
- search_arg_deinit, NULL);
+ search_arg_deinit, ctx);
if (ctx->mail_ctx.wanted_headers != NULL)
mailbox_header_lookup_unref(&ctx->mail_ctx.wanted_headers);
diff -r dc1db2eedbb1 -r 925d4a890a9b src/lib/lib-signals.c
--- a/src/lib/lib-signals.c Sun Sep 16 16:02:22 2012 +0300
+++ b/src/lib/lib-signals.c Sun Sep 16 16:08:18 2012 +0300
@@ -241,7 +241,7 @@
fd_close_on_exec(sig_pipe_fd[1], TRUE);
if (signals_initialized) {
io_sig = io_add(sig_pipe_fd[0], IO_READ,
- signal_read, NULL);
+ signal_read, (void *)NULL);
}
}
@@ -307,7 +307,8 @@
{
if (io_sig != NULL) {
io_remove(&io_sig);
- io_sig = io_add(sig_pipe_fd[0], IO_READ, signal_read, NULL);
+ io_sig = io_add(sig_pipe_fd[0], IO_READ,
+ signal_read, (void *)NULL);
}
}
@@ -323,8 +324,10 @@
lib_signals_set(i, signal_handlers[i]->flags);
}
- if (sig_pipe_fd[0] != -1)
- io_sig = io_add(sig_pipe_fd[0], IO_READ, signal_read, NULL);
+ if (sig_pipe_fd[0] != -1) {
+ io_sig = io_add(sig_pipe_fd[0], IO_READ,
+ signal_read, (void *)NULL);
+ }
}
void lib_signals_deinit(void)
diff -r dc1db2eedbb1 -r 925d4a890a9b src/replication/replicator/replicator.c
--- a/src/replication/replicator/replicator.c Sun Sep 16 16:02:22 2012 +0300
+++ b/src/replication/replicator/replicator.c Sun Sep 16 16:08:18 2012 +0300
@@ -78,7 +78,7 @@
queue = replicator_queue_init(set->replication_full_sync_interval);
replication_add_users(queue);
to_dump = timeout_add(REPLICATOR_DB_DUMP_INTERVAL_MSECS,
- replicator_dump_timeout, NULL);
+ replicator_dump_timeout, (void *)NULL);
brain = replicator_brain_init(queue, set);
}
More information about the dovecot-cvs
mailing list