Static analyzer fixes

[silc.git] / lib / silcutil / silctime.c

diff --git a/lib/silcutil/silctime.c b/lib/silcutil/silctime.c
index 3f3a2807fea4437569271eb3203b485bbfd6daae..5a91717213dbdee352a43b501105e5dac90e9c1c 100644 (file)
--- a/lib/silcutil/silctime.c
+++ b/lib/silcutil/silctime.c
@@ -108,6 +108,7 @@ SilcBool silc_time_value(SilcInt64 time_val, SilcTime ret_time)
   struct tm *t;
   unsigned int msec = 0;
   time_t timeval;
+  SilcInt32 ctz = 0;
 
   if (!ret_time)
     return TRUE;
@@ -139,34 +140,27 @@ SilcBool silc_time_value(SilcInt64 time_val, SilcTime ret_time)
 #else
 #if defined(HAVE_TIMEZONE)
   ret_time->utc_east   = timezone < 0 ? 1 : 0;
+  ctz = timezone;
+  if (ret_time->dst)
+    ctz -= 3600;
 #elif defined(HAVE_TM_GMTOFF)
   ret_time->utc_east   = t->tm_gmtoff > 0 ? 1 : 0;
+  ctz = -t->tm_gmtoff;
 #elif defined(HAVE___TM_GMTOFF)
   ret_time->utc_east   = t->__tm_gmtoff > 0 ? 1 : 0;
+  ctz = -t->__tm_gmtoff;
 #elif defined(HAVE___TM_GMTOFF__)
   ret_time->utc_east   = t->__tm_gmtoff__ > 0 ? 1 : 0;
+  ctz = -t->__tm_gmtoff__;
 #endif /* HAVE_TIMEZONE */
 
-#if defined(HAVE_TIMEZONE)
-  ret_time->utc_hour   = (ret_time->utc_east ? (-(timezone)) / 3600 :
-                         timezone / 3600);
-  if (ret_time->dst)
-    ret_time->utc_hour++;
-  ret_time->utc_minute = (ret_time->utc_east ? (-(timezone)) % 3600 :
-                         timezone % 3600);
-#elif defined(HAVE_GMTIME)
-  t = gmtime(&timeval);
-  if (t) {
-    ret_time->utc_hour   = (ret_time->utc_east
-                           ? ret_time->hour - t->tm_hour
-                           : ret_time->hour + t->tm_hour);
-    ret_time->utc_minute = (ret_time->utc_east
-                           ? ret_time->minute - t->tm_min
-                           : ret_time->minute + t->tm_min);
-  }
-#endif /* HAVE_TIMEZONE */
+  ret_time->utc_hour   = (ret_time->utc_east ? (-(ctz)) / 3600 : ctz / 3600);
+  ret_time->utc_minute = (ret_time->utc_east ? (-(ctz)) % 3600 : ctz % 3600);
 #endif /* SILC_WIN32 */
 
+  if (ret_time->utc_minute)
+    ret_time->utc_minute /= 60;
+
   return TRUE;
 }
 
@@ -230,9 +224,9 @@ SilcBool silc_time_universal(const char *universal_time, SilcTime ret_time)
       return FALSE;
     }
 
-    if (hour < 0 || hour > 23)
+    if (hour > 23)
       return FALSE;
-    if (minute < 0 || minute > 60)
+    if (minute > 60)
       return FALSE;
 
     ret_time->utc_hour   = hour;
@@ -348,9 +342,9 @@ SilcBool silc_time_generalized(const char *generalized_time, SilcTime ret_time)
       return FALSE;
     }
 
-    if (hour < 0 || hour > 23)
+    if (hour > 23)
       return FALSE;
-    if (minute < 0 || minute > 60)
+    if (minute > 60)
       return FALSE;
 
     ret_time->utc_hour   = hour;