From: Stephan Bosch Date: Sun, 30 Jun 2019 09:07:06 +0000 (+0200) Subject: lib: event-log - Reformat event_get_log_prefix(). X-Git-Tag: 2.3.9~404 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=455a1899e99a8ce431e676c003b27b6f5f778a04;p=thirdparty%2Fdovecot%2Fcore.git lib: event-log - Reformat event_get_log_prefix(). --- diff --git a/src/lib/event-log.c b/src/lib/event-log.c index 1bd08856cf..72a7c07a00 100644 --- a/src/lib/event-log.c +++ b/src/lib/event-log.c @@ -94,20 +94,22 @@ void e_log(struct event *event, enum log_type level, va_end(args); } -static bool event_get_log_prefix(struct event *event, string_t *log_prefix, - bool *replace_prefix, unsigned int *type_pos) +static bool +event_get_log_prefix(struct event *event, string_t *log_prefix, + bool *replace_prefix, unsigned int *type_pos) { - bool ret = FALSE; const char *prefix = event->log_prefix; + bool ret = FALSE; - if (event->log_prefix_callback != NULL) - prefix = event->log_prefix_callback(event->log_prefix_callback_context); + if (event->log_prefix_callback != NULL) { + prefix = event->log_prefix_callback( + event->log_prefix_callback_context); + } if (event->log_prefix_replace) { /* this event replaces all parent log prefixes */ *replace_prefix = TRUE; - *type_pos = prefix == NULL ? 0 : - strlen(prefix); + *type_pos = (prefix == NULL ? 0 : strlen(prefix)); } else if (event->parent == NULL) { /* append to default log prefix, don't replace it */ } else {