From 7d487a4c2afb326cd5735047800b248332b75000 Mon Sep 17 00:00:00 2001 From: Lasse Collin Date: Sat, 17 Feb 2024 23:07:35 +0200 Subject: [PATCH] xz: Fix message_init() description. Also explicitly initialize progress_automatic to make it clear that it can be read before message_init() sets it. Static variable was initialized to false by default already so this is only for clarity. (cherry picked from commit c701a5909ad9882469fbab4fab5d2d5556d3ba78) (cherry picked from commit 7d3418e496d00287d08a7f5af265379b757247a6) --- src/xz/main.c | 3 ++- src/xz/message.c | 2 +- src/xz/message.h | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/xz/main.c b/src/xz/main.c index ca8a4680..90bb69fd 100644 --- a/src/xz/main.c +++ b/src/xz/main.c @@ -156,7 +156,8 @@ main(int argc, char **argv) // Set up the locale and message translations. tuklib_gettext_init(PACKAGE, LOCALEDIR); - // Initialize handling of error/warning/other messages. + // Initialize progress message handling. It's not always needed + // but it's simpler to do this unconditionally. message_init(); // Set hardware-dependent default values. These can be overridden diff --git a/src/xz/message.c b/src/xz/message.c index 064a0450..c7c24dce 100644 --- a/src/xz/message.c +++ b/src/xz/message.c @@ -42,7 +42,7 @@ static bool current_filename_printed = false; /// True if we should print progress indicator and update it automatically /// if also verbose >= V_VERBOSE. -static bool progress_automatic; +static bool progress_automatic = false; /// True if message_progress_start() has been called but /// message_progress_end() hasn't been called yet. diff --git a/src/xz/message.h b/src/xz/message.h index d7af1cd9..bed9cbd4 100644 --- a/src/xz/message.h +++ b/src/xz/message.h @@ -24,7 +24,10 @@ enum message_verbosity { extern const int message_progress_sigs[]; -/// \brief Initializes the message functions +/// \brief Initializes the progress message functions +/// +/// message_fatal() and such can be called even before message_init() +/// has been called. /// /// If an error occurs, this function doesn't return. ///