p/xK
1
1
Fork 0
Code Issues 1 Pull Requests Releases 11 Wiki Activity

degesch: clean up log_formatter()

Browse Source
This commit is contained in:
Přemysl Eric Janouch 2015-06-28 20:56:45 +02:00
parent 0074b1eda9
commit b5d472f0df
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
degesch.c
View File

@ -2473,7 +2473,7 @@ log_formatter (struct app_context *ctx,
line->flags = flags; line->flags = flags;
line->when = time (NULL); line->when = time (NULL);
// Move the formater inside // Move the formatter inside
line->formatter = xmalloc (sizeof *line->formatter); line->formatter = xmalloc (sizeof *line->formatter);
*line->formatter = *f; *line->formatter = *f;
@ -2485,12 +2485,6 @@ log_formatter (struct app_context *ctx,
|| (buffer->type == BUFFER_PM && buffer != ctx->current_buffer)) || (buffer->type == BUFFER_PM && buffer != ctx->current_buffer))
input_ding (&ctx->input); input_ding (&ctx->input);
if (buffer == ctx->current_buffer)
{
buffer_line_display (ctx, line, false);
return;
}
bool can_leak = false; bool can_leak = false;
if ((buffer == ctx->global_buffer) if ((buffer == ctx->global_buffer)
|| (ctx->current_buffer->type == BUFFER_GLOBAL || (ctx->current_buffer->type == BUFFER_GLOBAL
@ -2499,7 +2493,9 @@ log_formatter (struct app_context *ctx,
&& buffer == ctx->current_buffer->server->buffer)) && buffer == ctx->current_buffer->server->buffer))
can_leak = true; can_leak = true;
if (!ctx->isolate_buffers && can_leak) if (buffer == ctx->current_buffer)
buffer_line_display (ctx, line, false);
else if (!ctx->isolate_buffers && can_leak)
buffer_line_display (ctx, line, true); buffer_line_display (ctx, line, true);
else else
{ {