simplifications.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/imap/util.c b/imap/util.c
index 3f14b78..ba05df1 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -258,45 +258,31 @@ time_t imap_parse_date (char *s)
   struct tm t;
   time_t tz;
 
   struct tm t;
   time_t tz;
 

-  t.tm_mday = (s[0] == ' ' ? s[1] - '0' : (s[0] - '0') * 10 + (s[1] - '0'));
-  s += 2;
-  if (*s != '-')
+  t.tm_mday = strtol(s, &s, 10);
+  if (*s++ != '-')

     return 0;
     return 0;

-  s++;
-  t.tm_mon = mutt_check_month (s);
+  t.tm_mon = mutt_check_month(s);

   s += 3;
   s += 3;

-  if (*s != '-')
+  if (*s++ != '-')

     return 0;
     return 0;

-  s++;
-  t.tm_year =
-    (s[0] - '0') * 1000 + (s[1] - '0') * 100 + (s[2] - '0') * 10 + (s[3] -
-                                                                    '0') -
-    1900;
-  s += 4;
-  if (*s != ' ')
+  t.tm_year = strtol(s, &s, 10) - 1900;
+  if (*s++ != ' ')

     return 0;
     return 0;

-  s++;

 
   /* time */
 
   /* time */

-  t.tm_hour = (s[0] - '0') * 10 + (s[1] - '0');
-  s += 2;
-  if (*s != ':')
+  t.tm_hour = strtol(s, &s, 10);
+  if (*s++ != ':')

     return 0;
     return 0;

-  s++;
-  t.tm_min = (s[0] - '0') * 10 + (s[1] - '0');
-  s += 2;
-  if (*s != ':')
+  t.tm_min = strtol(s, &s, 10);
+  if (*s++ != ':')

     return 0;
     return 0;

-  s++;
-  t.tm_sec = (s[0] - '0') * 10 + (s[1] - '0');
-  s += 2;
-  if (*s != ' ')
+  t.tm_sec = strtol(s, &s, 10);
+  if (*s++ != ' ')

     return 0;
     return 0;

-  s++;

 
   /* timezone */
 
   /* timezone */

-  tz = ((s[1] - '0') * 10 + (s[2] - '0')) * 3600 +
-    ((s[3] - '0') * 10 + (s[4] - '0')) * 60;
+  tz = strtol(s + 1, NULL, 10);
+  tz = (tz / 100) * 3600 + (tz % 100) * 60;

   if (s[0] == '+')
     tz = -tz;
 
   if (s[0] == '+')
     tz = -tz;