Merge tag 'upstream/0.7.6'

Upstream version 0.7.6

1 files changed, 9 insertions, 7 deletions

diff --git a/info_scr.c b/info_scr.c
index 0b8eace..1251ae0 100644
--- a/info_scr.c
+++ b/info_scr.c
@@ -75,8 +75,10 @@ static void display_levels(void)
 		qual = ewma(qual, cur.stat.qual.qual, conf.meter_decay / 100.0);
 
 		mvwaddstr(w_levels, line++, 1, "link quality: ");
-		sprintf(tmp, "%0.f/%d  ", qual, cur.range.max_qual.qual);
+		sprintf(tmp, "%0.f%%  ", (1e2 * qual)/cur.range.max_qual.qual);
 		waddstr_b(w_levels, tmp);
+		sprintf(tmp, "(%0.f/%d)  ", qual, cur.range.max_qual.qual);
+		waddstr(w_levels, tmp);
 
 		waddbar(w_levels, line++, qual, 0, cur.range.max_qual.qual,
 			lvlscale, true);
@@ -151,20 +153,20 @@ static void display_stats(void)
 	waddstr_b(w_stats, tmp);
 
 	waddstr(w_stats, ", invalid: ");
-	sprintf(tmp, "%'u", cur.stat.discard.nwid);
+	sprintf(tmp, "%u", cur.stat.discard.nwid);
 
 	waddstr_b(w_stats, tmp);
 	waddstr(w_stats, " nwid, ");
 
-	sprintf(tmp, "%'u", cur.stat.discard.code);
+	sprintf(tmp, "%u", cur.stat.discard.code);
 	waddstr_b(w_stats, tmp);
 	waddstr(w_stats, " crypt, ");
 
-	sprintf(tmp, "%'u", cur.stat.discard.fragment);
+	sprintf(tmp, "%u", cur.stat.discard.fragment);
 	waddstr_b(w_stats, tmp);
 	waddstr(w_stats, " frag, ");
 
-	sprintf(tmp, "%'u", cur.stat.discard.misc);
+	sprintf(tmp, "%u", cur.stat.discard.misc);
 	waddstr_b(w_stats, tmp);
 	waddstr(w_stats, " misc");
 
@@ -180,11 +182,11 @@ static void display_stats(void)
 	waddstr_b(w_stats, tmp);
 
 	waddstr(w_stats, ", mac retries: ");
-	sprintf(tmp, "%'u", cur.stat.discard.retries);
+	sprintf(tmp, "%u", cur.stat.discard.retries);
 	waddstr_b(w_stats, tmp);
 
 	waddstr(w_stats, ", missed beacons: ");
-	sprintf(tmp, "%'u", cur.stat.miss.beacon);
+	sprintf(tmp, "%u", cur.stat.miss.beacon);
 	waddstr_b(w_stats, tmp);
 
 	wclrtoborder(w_stats);