From: Josef 'Jeff' Sipek Date: Sat, 30 Jun 2018 14:13:10 +0000 (-0400) Subject: global: Start relying on event_set_forced_debug(e, FALSE) being a no-op X-Git-Tag: 2.3.3.rc1~137 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=47418f3ab4dea16e6b1f0553c5744fce85880ceb;p=thirdparty%2Fdovecot%2Fcore.git global: Start relying on event_set_forced_debug(e, FALSE) being a no-op Converted using the following semantic patch: @@ expression event; expression cond; @@ - if (cond) { - event_set_forced_debug(event, ( - TRUE | - cond ) - ); - } + event_set_forced_debug(event, cond); --- diff --git a/src/auth/auth-client-connection.c b/src/auth/auth-client-connection.c index 0973e48e2b..ac3b56d904 100644 --- a/src/auth/auth-client-connection.c +++ b/src/auth/auth-client-connection.c @@ -336,8 +336,7 @@ void auth_client_connection_create(struct auth *auth, int fd, conn->login_requests = login_requests; conn->token_auth = token_auth; conn->event = event_create(NULL); - if (auth->set->debug) - event_set_forced_debug(conn->event, TRUE); + event_set_forced_debug(conn->event, auth->set->debug); event_add_category(conn->event, &event_category_auth); random_fill(conn->cookie, sizeof(conn->cookie)); diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c index e78d6eb840..d383ba424a 100644 --- a/src/auth/auth-request.c +++ b/src/auth/auth-request.c @@ -87,8 +87,7 @@ static void auth_request_post_alloc_init(struct auth_request *request, struct ev request->debug = request->set->debug; request->extra_fields = auth_fields_init(request->pool); request->event = event_create(parent_event); - if (request->set->debug) - event_set_forced_debug(request->event, TRUE); + event_set_forced_debug(request->event, request->set->debug); event_add_category(request->event, &event_category_auth); } diff --git a/src/auth/auth.c b/src/auth/auth.c index 1f9a4b0b97..e6370c6de5 100644 --- a/src/auth/auth.c +++ b/src/auth/auth.c @@ -377,8 +377,7 @@ void auths_preinit(const struct auth_settings *set, pool_t pool, bool check_default = TRUE; auth_event = event_create(NULL); - if (set->debug) - event_set_forced_debug(auth_event, TRUE); + event_set_forced_debug(auth_event, set->debug); event_add_category(auth_event, &event_category_auth); i_array_init(&auths, 8); diff --git a/src/imap-urlauth/imap-urlauth-client.c b/src/imap-urlauth/imap-urlauth-client.c index 8d843efc29..3764d7c049 100644 --- a/src/imap-urlauth/imap-urlauth-client.c +++ b/src/imap-urlauth/imap-urlauth-client.c @@ -67,8 +67,7 @@ int client_create(const char *service, const char *username, client->set = set; client->event = event_create(NULL); - if (set->mail_debug) - event_set_forced_debug(client->event, TRUE); + event_set_forced_debug(client->event, set->mail_debug); event_add_category(client->event, &event_category_urlauth); if (client_worker_connect(client) < 0) { diff --git a/src/lib-http/http-client-request.c b/src/lib-http/http-client-request.c index 13d6a9565b..2a2135078b 100644 --- a/src/lib-http/http-client-request.c +++ b/src/lib-http/http-client-request.c @@ -235,8 +235,7 @@ void http_client_request_set_event(struct http_client_request *req, { event_unref(&req->event); req->event = event_create(event); - if (req->client->set.debug) - event_set_forced_debug(req->event, TRUE); + event_set_forced_debug(req->event, req->client->set.debug); http_client_request_update_event(req); } diff --git a/src/lib-http/http-client.c b/src/lib-http/http-client.c index 4b4e7cce04..d25902a0d3 100644 --- a/src/lib-http/http-client.c +++ b/src/lib-http/http-client.c @@ -135,8 +135,8 @@ http_client_init_shared(struct http_client_context *cctx, parent_event = event_get_parent(cctx->event); } client->event = event_create(parent_event); - if ((set != NULL && set->debug) || (cctx != NULL && cctx->set.debug)) - event_set_forced_debug(client->event, TRUE); + event_set_forced_debug(client->event, + (set != NULL && set->debug) || (cctx != NULL && cctx->set.debug)); event_set_append_log_prefix(client->event, log_prefix); /* merge provided settings with context defaults */ @@ -437,8 +437,7 @@ http_client_context_create(const struct http_client_settings *set) cctx->ioloop = current_ioloop; cctx->event = event_create(set->event); - if (set->debug) - event_set_forced_debug(cctx->event, TRUE); + event_set_forced_debug(cctx->event, set->debug); event_set_append_log_prefix(cctx->event, "http-client: "); cctx->set.dns_client = set->dns_client; diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c index 9e2609b591..42485fbdc0 100644 --- a/src/lib-storage/mail-storage-service.c +++ b/src/lib-storage/mail-storage-service.c @@ -1322,9 +1322,8 @@ mail_storage_service_lookup_real(struct mail_storage_service_ctx *ctx, This event won't be a parent to any other events - mail_user.event will be used for that. */ user->event = event_create(input->parent_event); - if (user->service_ctx->debug || - (flags & MAIL_STORAGE_SERVICE_FLAG_DEBUG) != 0) - event_set_forced_debug(user->event, TRUE); + event_set_forced_debug(user->event, + user->service_ctx->debug || (flags & MAIL_STORAGE_SERVICE_FLAG_DEBUG) != 0); event_add_fields(user->event, (const struct event_add_field []){ { .key = "user", .value = user->input.username }, { .key = "service", .value = ctx->service->name }, diff --git a/src/login-common/main.c b/src/login-common/main.c index 2112e2052c..e493195f19 100644 --- a/src/login-common/main.c +++ b/src/login-common/main.c @@ -457,8 +457,7 @@ static void main_init(const char *login_socket) restrict_process_count(1); event_auth = event_create(NULL); - if (global_login_settings->auth_debug) - event_set_forced_debug(event_auth, TRUE); + event_set_forced_debug(event_auth, global_login_settings->auth_debug); event_add_category(event_auth, &event_category_auth); i_array_init(&global_alt_usernames, 4);