From 8586358c5ab1a0c1d22e5bec717637d1966e542a Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Mon, 29 Aug 2016 11:54:36 +0100 Subject: [PATCH] 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. --- mtr.c | 3 +-- mtr.h | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mtr.c b/mtr.c index ccf00f4..e210593 100644 --- 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 6ef297d..30322e3 100644 --- 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 */ -- 2.47.2