Browse Source

Move opt_quiet check to my_log_curses, so it works for curses-less builds

nfactor-troky
Luke Dashjr 12 years ago
parent
commit
80593c47fc
  1. 5
      cgminer.c
  2. 3
      logging.c
  3. 1
      miner.h

5
cgminer.c

@ -87,7 +87,7 @@ static bool opt_benchmark;
static bool have_longpoll; static bool have_longpoll;
static bool want_per_device_stats; static bool want_per_device_stats;
bool use_syslog; bool use_syslog;
static bool opt_quiet; bool opt_quiet;
static bool opt_realquiet; static bool opt_realquiet;
bool opt_loginput; bool opt_loginput;
const int opt_cutofftemp = 95; const int opt_cutofftemp = 95;
@ -1566,9 +1566,6 @@ void log_curses(int prio, const char *f, va_list ap)
{ {
bool high_prio; bool high_prio;
if (opt_quiet && prio != LOG_ERR)
return;
high_prio = (prio == LOG_WARNING || prio == LOG_ERR); high_prio = (prio == LOG_WARNING || prio == LOG_ERR);
if (curses_active_locked()) { if (curses_active_locked()) {

3
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) static void my_log_curses(__maybe_unused int prio, char *f, va_list ap)
{ {
if (opt_quiet && prio != LOG_ERR)
return;
#ifdef HAVE_CURSES #ifdef HAVE_CURSES
extern bool use_curses; extern bool use_curses;
if (use_curses) if (use_curses)

1
miner.h

@ -614,6 +614,7 @@ extern int opt_n_threads;
extern int num_processors; extern int num_processors;
extern int hw_errors; extern int hw_errors;
extern bool use_syslog; extern bool use_syslog;
extern bool opt_quiet;
extern struct thr_info *thr_info; extern struct thr_info *thr_info;
extern struct cgpu_info gpus[MAX_GPUDEVICES]; extern struct cgpu_info gpus[MAX_GPUDEVICES];
extern int gpu_threads; extern int gpu_threads;

Loading…
Cancel
Save