commit 5494087ed76475d30d80b47205cf8a0c5fb8ea69 Author: Taylor Yu catalyst@torproject.org Date: Mon May 1 14:00:06 2017 -0400

Delete useless checks in confparse.c

config_parse_interval() and config_parse_msec_interval() were checking whether the variable "ok" (a pointer to an int) was null, rather than derefencing it. Both functions are static, and all existing callers pass a valid pointer to those static functions. The callers do check the variables (also confusingly named "ok") whose addresses they pass as the "ok" arguments, so even if the pointer check were corrected to be a dereference, it would be redundant.

Fixes #22103. --- src/or/confparse.c | 4 ---- 1 file changed, 4 deletions(-)

diff --git a/src/or/confparse.c b/src/or/confparse.c index 75ec92e..abae7e3 100644 --- a/src/or/confparse.c +++ b/src/or/confparse.c @@ -1190,8 +1190,6 @@ config_parse_msec_interval(const char *s, int *ok) { uint64_t r; r = config_parse_units(s, time_msec_units, ok); - if (!ok) - return -1; if (r > INT_MAX) { log_warn(LD_CONFIG, "Msec interval '%s' is too long", s); *ok = 0; @@ -1209,8 +1207,6 @@ config_parse_interval(const char *s, int *ok) { uint64_t r; r = config_parse_units(s, time_units, ok); - if (!ok) - return -1; if (r > INT_MAX) { log_warn(LD_CONFIG, "Interval '%s' is too long", s); *ok = 0;