Merge branch 'bfgminer-2.10.x' into bfgminer

miner.c

@@ -1909,7 +1909,6 @@ static bool work_decode(struct pool *pool, struct work *work, json_t *val)
 
 	ret = true;
 
-out:
 	return ret;
 }
 
@@ -4279,7 +4278,7 @@ bool stale_work_future(struct work *work, bool share, unsigned long ustime)
 static void restart_threads(void)
 {
 	struct pool *cp = current_pool();
-	int i, fd;
+	int i;
 	struct thr_info *thr;
 
 	/* Artificially set the lagging flag to avoid pool not providing work
@@ -7186,7 +7185,7 @@ void print_summary(void)
 {
 	struct timeval diff;
 	int hours, mins, secs, i;
-	double utility, efficiency = 0.0, work_util;
+	double utility, efficiency = 0.0;
 
 	timersub(&total_tv_end, &total_tv_start, &diff);
 	hours = diff.tv_sec / 3600;
@@ -7195,7 +7194,6 @@ void print_summary(void)
 
 	utility = total_accepted / total_secs * 60;
 	efficiency = total_bytes_xfer ? total_diff_accepted * 2048. / total_bytes_xfer : 0.0;
-	work_util = total_diff1 / total_secs * 60;
 
 	applog(LOG_WARNING, "\nSummary of runtime statistics:\n");
 	applog(LOG_WARNING, "Started at %s", datestamp);
@@ -7499,7 +7497,8 @@ static void fork_monitor()
 
 #ifdef HAVE_CURSES
 void enable_curses(void) {
-	int x,y;
+	int x;
+	__maybe_unused int y;
 
 	lock_curses();
 	if (curses_active) {

util.c

@@ -1534,7 +1534,7 @@ out:
 	return ret;
 }
 
-curl_socket_t grab_socket_opensocket_cb(void *clientp, curlsocktype purpose, struct curl_sockaddr *addr)
+curl_socket_t grab_socket_opensocket_cb(void *clientp, __maybe_unused curlsocktype purpose, struct curl_sockaddr *addr)
 {
 	struct pool *pool = clientp;
 	curl_socket_t sck = socket(addr->family, addr->socktype, addr->protocol);