tidy: mutt_str_atoi()

diff --git a/mutt/string.c b/mutt/string.c
index 69a6336dbf75ce67993d87aa8f991356815b1b50..6f85c25fd3b82bc7d5a281a7dd6c347f084f9c4f 100644 (file)
--- a/mutt/string.c
+++ b/mutt/string.c
@@ -262,20 +262,19 @@ int mutt_str_atos(const char *str, short *dst)
  */
 int mutt_str_atoi(const char *str, int *dst)
 {
-  int rc;
-  long res;
-  int tmp;
-  int *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 ((int) res != res)
+  if ((res < INT_MIN) || (res > INT_MAX))
     return -2;
 
-  *t = (int) res;
+  if (dst)
+    *dst = (int) res;
+
   return 0;
 }