diff options
author | Kacper Michajłow <kasper93@gmail.com> | 2023-12-15 19:40:43 +0100 |
---|---|---|
committer | Dudemanguy <random342@airmail.cc> | 2023-12-27 20:59:22 +0000 |
commit | 1306ea98542b4a7b5ff818b865bc2eefb3c3a7be (patch) | |
tree | 30a7e7a5ce784090f3ded91bc8cf2d91d604c915 /common | |
parent | cadb68487e9c8f4237ba59b672180ad1460db514 (diff) | |
download | mpv-1306ea98542b4a7b5ff818b865bc2eefb3c3a7be.tar.bz2 mpv-1306ea98542b4a7b5ff818b865bc2eefb3c3a7be.tar.xz |
msg: reduce nesting in mp_msg_flush_status_line
Cosmetic change only.
Diffstat (limited to 'common')
-rw-r--r-- | common/msg.c | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/common/msg.c b/common/msg.c index 797048620b..f630d1ecc7 100644 --- a/common/msg.c +++ b/common/msg.c @@ -249,25 +249,29 @@ static void prepare_prefix(struct mp_log_root *root, bstr *out, int lev, int ter void mp_msg_flush_status_line(struct mp_log *log, bool clear) { - if (log->root) { - mp_mutex_lock(&log->root->lock); - if (log->root->status_lines) { - if (!clear) { - fprintf(stderr, TERM_ESC_RESTORE_CURSOR "\n"); - log->root->blank_lines = 0; - log->root->status_lines = 0; - goto done; - } - bstr term_msg = (bstr){0}; - prepare_prefix(log->root, &term_msg, MSGL_STATUS, 0); - if (term_msg.len) { - fprintf(stderr, "%.*s", BSTR_P(term_msg)); - talloc_free(term_msg.start); - } - } -done: - mp_mutex_unlock(&log->root->lock); + if (!log->root) + return; + + mp_mutex_lock(&log->root->lock); + if (!log->root->status_lines) + goto done; + + if (!clear) { + fprintf(stderr, TERM_ESC_RESTORE_CURSOR "\n"); + log->root->blank_lines = 0; + log->root->status_lines = 0; + goto done; + } + + bstr term_msg = {0}; + prepare_prefix(log->root, &term_msg, MSGL_STATUS, 0); + if (term_msg.len) { + fprintf(stderr, "%.*s", BSTR_P(term_msg)); + talloc_free(term_msg.start); } + +done: + mp_mutex_unlock(&log->root->lock); } void mp_msg_set_term_title(struct mp_log *log, const char *title) |