cleanup: use definition for a magic value appearing twice in code

This improves readability, and makes it almost impossible to get these out
of sync.

diff --git a/mtr.c b/mtr.c
index ccf00f4d11644668c53cbaa52d3d5b2dbd000100..e210593c1ac0dff226937b6122170e857200b178 100644 (file)
--- a/mtr.c
+++ b/mtr.c
@@ -311,8 +311,7 @@ static void init_fld_options (struct mtr_ctl *ctl)
 {
   int i;
 
-  for (i=0;i < 256;i++)
-    ctl->fld_index[i] = -1;
+  memset(ctl->fld_index, -1, FLD_INDEX_SZ);
 
   for (i=0;data_fields[i].key != 0;i++) {
     ctl->available_options[i] = data_fields[i].key;

diff --git a/mtr.h b/mtr.h
index 6ef297ddccecad5ccb00bda5fd087131ce13fd60..30322e3a7f6de008cc7a0df13ffc82dac65f4f33 100644 (file)
--- a/mtr.h
+++ b/mtr.h
@@ -73,6 +73,7 @@ typedef struct in_addr ip_t;
 
 /* stuff used by display such as report, curses... */
 #define MAXFLD 20              /* max stats fields to display */
+#define FLD_INDEX_SZ 256
 
 #ifndef HAVE_SOCKLEN_T
 typedef int socklen_t;
@@ -107,7 +108,7 @@ struct mtr_ctl {
   int localport;               /* source port for UDP tracing */
   int tcp_timeout;             /* timeout for TCP connections */
   unsigned char fld_active[2 * MAXFLD];        /* SO_MARK to set for ping packet*/
-  int fld_index[256];          /* default display field (defined by key in net.h) and order */
+  int fld_index[FLD_INDEX_SZ]; /* default display field (defined by key in net.h) and order */
   char available_options[MAXFLD];
   int display_offset;          /* only used in text mode */
   void *gtk_data;              /* pointer to hold arbitrary gtk data */