Commit 80593c47fce8bfe3dbc9d7b3d258edad2ab0a7ae
2012-07-23T19:56:03
Move opt_quiet check to my_log_curses, so it works for curses-less builds
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49
diff --git a/cgminer.c b/cgminer.c
index ea54081..6d95df9 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -87,7 +87,7 @@ static bool opt_benchmark;
static bool have_longpoll;
static bool want_per_device_stats;
bool use_syslog;
-static bool opt_quiet;
+bool opt_quiet;
static bool opt_realquiet;
bool opt_loginput;
const int opt_cutofftemp = 95;
@@ -1566,9 +1566,6 @@ void log_curses(int prio, const char *f, va_list ap)
{
bool high_prio;
- if (opt_quiet && prio != LOG_ERR)
- return;
-
high_prio = (prio == LOG_WARNING || prio == LOG_ERR);
if (curses_active_locked()) {
diff --git a/logging.c b/logging.c
index fb3868f..db62374 100644
--- a/logging.c
+++ b/logging.c
@@ -20,6 +20,9 @@ int opt_log_level = LOG_NOTICE;
static void my_log_curses(__maybe_unused int prio, char *f, va_list ap)
{
+ if (opt_quiet && prio != LOG_ERR)
+ return;
+
#ifdef HAVE_CURSES
extern bool use_curses;
if (use_curses)
diff --git a/miner.h b/miner.h
index 120d763..76689c0 100644
--- a/miner.h
+++ b/miner.h
@@ -614,6 +614,7 @@ extern int opt_n_threads;
extern int num_processors;
extern int hw_errors;
extern bool use_syslog;
+extern bool opt_quiet;
extern struct thr_info *thr_info;
extern struct cgpu_info gpus[MAX_GPUDEVICES];
extern int gpu_threads;