From 96e3f7053fcfafa1bdd497e94a663837a0188e5a Mon Sep 17 00:00:00 2001 From: Lehi Toskin Date: Sun, 16 Feb 2014 13:19:40 -0800 Subject: Replaced magic numbers inside candidates_create_internal() with enumerated list --- toxcore/assoc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'toxcore/assoc.c') diff --git a/toxcore/assoc.c b/toxcore/assoc.c index 2162ea78..adddb344 100644 --- a/toxcore/assoc.c +++ b/toxcore/assoc.c @@ -425,22 +425,23 @@ static uint8_t candidates_create_internal(Assoc *assoc, hash_t hash, uint8_t *id * 1. seen bad, heard good * 2. seen good * 3. used */ + // enumerated lists are superior to magic numbers if (!is_timeout(entry->used_at, BAD_NODE_TIMEOUT)) - check = 3; + check = USED; if (!is_timeout(entry->seen_at, CANDIDATES_SEEN_TIMEOUT)) - check = 2; + check = SEENG; else if (!is_timeout(entry->heard_at, CANDIDATES_HEARD_TIMEOUT)) - check = 1; + check = SEENB_HEARDG; else - check = 0; + check = BAD; if (!pos_check[check]) pos_check[check] = pos + 1; } /* used > seen > heard > bad */ - size_t i, pos_max = used ? 3 : (seen ? 2 : 1); + size_t i, pos_max = used ? USED : (seen ? SEENG : SEENB_HEARDG); for (i = 0; i < pos_max; i++) if (pos_check[i]) { -- cgit v1.2.3