From 14500a31034b09230bf59885a07b3f0dc8a1bfdd Mon Sep 17 00:00:00 2001 From: Richard Russon Date: Tue, 23 Apr 2019 00:05:49 +0100 Subject: [PATCH] tidy: mutt_str_atos() --- mutt/string.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/mutt/string.c b/mutt/string.c index 56054008f..69a6336db 100644 --- a/mutt/string.c +++ b/mutt/string.c @@ -232,20 +232,19 @@ int mutt_str_atol(const char *str, long *dst) */ int mutt_str_atos(const char *str, short *dst) { - int rc; - long res; - short tmp; - short *t = dst ? dst : &tmp; - - *t = 0; + if (dst) + *dst = 0; - rc = mutt_str_atol(str, &res); + long res = 0; + int rc = mutt_str_atol(str, &res); if (rc < 0) return rc; - if ((short) res != res) + if ((res < SHRT_MIN) || (res > SHRT_MAX)) return -2; - *t = (short) res; + if (dst) + *dst = (short) res; + return 0; } -- 2.49.0