From: Richard Woodbury <rpwoodbu@mybox.org>
Date: Fri, 14 Jun 2013 23:13:02 +0000 (-0400)
Subject: Use MAX_FACTORS to convey length of factors[] and scale[] arrays.
X-Git-Tag: v0.85~1^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=11f5f44812ca9498d166d3c345e96c6115a6c9bb;p=thirdparty%2Fmtr.git

Use MAX_FACTORS to convey length of factors[] and scale[] arrays.
---

diff --git a/curses.c b/curses.c
index 0584bb9..90c5fd4 100644
--- a/curses.c
+++ b/curses.c
@@ -426,9 +426,9 @@ void mtr_curses_hosts(int startstat)
   move(2, 0);
 }
 
-
-static double factors[] = { 0.02, 0.05, 0.08, 0.15, 0.33, 0.50, 0.80, 1.00 };
-static int scale[8];
+#define NUM_FACTORS 8
+static double factors[NUM_FACTORS] = { 0.02, 0.05, 0.08, 0.15, 0.33, 0.50, 0.80, 1.00 };
+static int scale[NUM_FACTORS];
 static int low_ms, high_ms;
 
 void mtr_gen_scale(void) 
@@ -439,7 +439,7 @@ void mtr_gen_scale(void)
 	low_ms = 1000000;
 	high_ms = -1;
 
-	for (i = 0; i < 8; i++) {
+	for (i = 0; i < NUM_FACTORS; i++) {
 		scale[i] = 0;
 	}
 	max = net_max();
@@ -456,19 +456,20 @@ void mtr_gen_scale(void)
 		}
 	}
 	range = high_ms - low_ms;
-	for (i = 0; i < 8; i++) {
+	for (i = 0; i < NUM_FACTORS; i++) {
 		scale[i] = low_ms + ((double)range * factors[i]);
 	}
 }
 
 
+/* NB: Must have NUM_FACTORS elements. */
 static const char* block_map = ".123abc>";
 
 void mtr_print_scaled(int ms) 
 {
 	int i;
 
-	for (i = 0; i < 8; i++) {
+	for (i = 0; i < NUM_FACTORS; i++) {
 		if (ms <= scale[i]) {
 			printw("%c", block_map[i]);
 			return;
@@ -494,7 +495,7 @@ void mtr_fill_graph(int at, int cols)
 		} else {
 			if (display_mode == 1) {
 				if (saved[i] > scale[6]) {
-					printw("%c", block_map[7]);
+					printw("%c", block_map[NUM_FACTORS-1]);
 				} else {
 					printw(".");
 				}
@@ -637,7 +638,7 @@ void mtr_curses_redraw(void)
     printw("Scale:");
     attroff(A_BOLD);
     
-    for (i = 0; i < 7; i++) {
+    for (i = 0; i < NUM_FACTORS-1; i++) {
       printw("  %c:%d ms", block_map[i], scale[i]/1000);
     }
   }