From 895dd9e4e2f4f7cf58cf71a61072eebf5cdab0f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= Date: Mon, 13 May 2024 22:13:41 +0200 Subject: [PATCH] msg: split mp_msg_flush_status_line into private and public variant --- common/msg.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/common/msg.c b/common/msg.c index 07804660f6..f0e33617eb 100644 --- a/common/msg.c +++ b/common/msg.c @@ -246,34 +246,39 @@ static void prepare_prefix(struct mp_log_root *root, bstr *out, int lev, int ter root->blank_lines += root->status_lines; } -void mp_msg_flush_status_line(struct mp_log *log, bool clear) +static void msg_flush_status_line(struct mp_log_root *root, bool clear) { - if (!log->root) - return; - - mp_mutex_lock(&log->root->lock); - if (!log->root->status_lines) + if (!root->status_lines) goto done; - FILE *fp = term_msg_fp(log->root, MSGL_STATUS); + FILE *fp = term_msg_fp(root, MSGL_STATUS); if (!clear) { - if (log->root->isatty[term_msg_fileno(log->root, MSGL_STATUS)]) + if (root->isatty[term_msg_fileno(root, MSGL_STATUS)]) fprintf(fp, TERM_ESC_RESTORE_CURSOR); fprintf(fp, "\n"); - log->root->blank_lines = 0; - log->root->status_lines = 0; + root->blank_lines = 0; + root->status_lines = 0; goto done; } bstr term_msg = {0}; - prepare_prefix(log->root, &term_msg, MSGL_STATUS, 0); + prepare_prefix(root, &term_msg, MSGL_STATUS, 0); if (term_msg.len) { fprintf(fp, "%.*s", BSTR_P(term_msg)); talloc_free(term_msg.start); } done: - log->root->status_line.len = 0; + root->status_line.len = 0; +} + +void mp_msg_flush_status_line(struct mp_log *log, bool clear) +{ + if (!log->root) + return; + + mp_mutex_lock(&log->root->lock); + msg_flush_status_line(log->root, clear); mp_mutex_unlock(&log->root->lock); }