From b02fef5c70281be962541b3a4e3627e91422e5f3 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Sat, 21 Aug 2021 17:18:56 +0200 Subject: [PATCH] rename globals print_lock --- client/src/ui.c | 6 +++--- client/src/ui.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/src/ui.c b/client/src/ui.c index 3e6a68cf3..227fec7fe 100644 --- a/client/src/ui.c +++ b/client/src/ui.c @@ -52,7 +52,7 @@ double g_GridOffset = 0; bool g_GridLocked = false; bool showDemod = true; -pthread_mutex_t print_lock = PTHREAD_MUTEX_INITIALIZER; +pthread_mutex_t g_print_lock = PTHREAD_MUTEX_INITIALIZER; static void fPrintAndLog(FILE *stream, const char *fmt, ...); @@ -307,7 +307,7 @@ static void fPrintAndLog(FILE *stream, const char *fmt, ...) { char buffer2[MAX_PRINT_BUFFER] = {0}; char buffer3[MAX_PRINT_BUFFER] = {0}; // lock this section to avoid interlacing prints from different threads - pthread_mutex_lock(&print_lock); + pthread_mutex_lock(&g_print_lock); bool linefeed = true; if (logging && session.incognito) { @@ -405,7 +405,7 @@ static void fPrintAndLog(FILE *stream, const char *fmt, ...) { fflush(stdout); //release lock - pthread_mutex_unlock(&print_lock); + pthread_mutex_unlock(&g_print_lock); } void SetFlushAfterWrite(bool value) { diff --git a/client/src/ui.h b/client/src/ui.h index 21ad74be7..e4f0d6dbd 100644 --- a/client/src/ui.h +++ b/client/src/ui.h @@ -70,7 +70,7 @@ void memcpy_filter_emoji(void *dest, const void *src, size_t n, emojiMode_t mode int searchHomeFilePath(char **foundpath, const char *subdir, const char *filename, bool create_home); -extern pthread_mutex_t print_lock; +extern pthread_mutex_t g_print_lock; void print_progress(size_t count, uint64_t max, barMode_t style);