commit 4638be5312f527e4769317b2b222faa52bbe0093 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 3 10:28:10 2018 -0400
Use the standard SHRT_MAX name. --- src/lib/cc/torint.h | 4 ---- src/or/addressmap.c | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/lib/cc/torint.h b/src/lib/cc/torint.h index e633722ba..91db25833 100644 --- a/src/lib/cc/torint.h +++ b/src/lib/cc/torint.h @@ -95,10 +95,6 @@ typedef int32_t ssize_t; #endif /* (SIZEOF_SIZE_T == 4) || ... */ #endif /* !defined(SIZE_MAX) */
-#ifndef SHORT_MAX -#define SHORT_MAX SHRT_MAX -#endif - #ifdef _WIN32 # ifdef _WIN64 # define TOR_PRIuSZ PRIu64 diff --git a/src/or/addressmap.c b/src/or/addressmap.c index a0df5c986..805d21ae7 100644 --- a/src/or/addressmap.c +++ b/src/or/addressmap.c @@ -642,7 +642,7 @@ client_dns_incr_failures(const char *address) ent->expires = time(NULL) + MAX_DNS_ENTRY_AGE; strmap_set(addressmap,address,ent); } - if (ent->num_resolve_failures < SHORT_MAX) + if (ent->num_resolve_failures < SHRT_MAX) ++ent->num_resolve_failures; /* don't overflow */ log_info(LD_APP, "Address %s now has %d resolve failures.", safe_str_client(address), @@ -1153,4 +1153,3 @@ addressmap_get_mappings(smartlist_t *sl, time_t min_expires, iter = strmap_iter_next(addressmap,iter); } } -