Merge remote-tracking branch 'github/pr/2006'

[collectd.git] / src / daemon / utils_time.c

diff --git a/src/daemon/utils_time.c b/src/daemon/utils_time.c
index 77c1b68..b24ceac 100644 (file)
--- a/src/daemon/utils_time.c
+++ b/src/daemon/utils_time.c
@@ -86,15 +86,12 @@ cdtime_t cdtime (void) /* {{{ */
 
 static int get_utc_time (cdtime_t t, struct tm *t_tm, long *nsec) /* {{{ */
 {
-  struct timespec t_spec;
-  int status;
-
-  CDTIME_T_TO_TIMESPEC (t, &t_spec);
+  struct timespec t_spec = CDTIME_T_TO_TIMESPEC (t);
   NORMALIZE_TIMESPEC (t_spec);
 
   if (gmtime_r (&t_spec.tv_sec, t_tm) == NULL) {
     char errbuf[1024];
-    status = errno;
+    int status = errno;
     ERROR ("get_utc_time: gmtime_r failed: %s",
         sstrerror (status, errbuf, sizeof (errbuf)));
     return status;
@@ -106,15 +103,12 @@ static int get_utc_time (cdtime_t t, struct tm *t_tm, long *nsec) /* {{{ */
 
 static int get_local_time (cdtime_t t, struct tm *t_tm, long *nsec) /* {{{ */
 {
-  struct timespec t_spec;
-  int status;
-
-  CDTIME_T_TO_TIMESPEC (t, &t_spec);
+  struct timespec t_spec = CDTIME_T_TO_TIMESPEC (t);
   NORMALIZE_TIMESPEC (t_spec);
 
   if (localtime_r (&t_spec.tv_sec, t_tm) == NULL) {
     char errbuf[1024];
-    status = errno;
+    int status = errno;
     ERROR ("get_local_time: localtime_r failed: %s",
         sstrerror (status, errbuf, sizeof (errbuf)));
     return status;
@@ -133,16 +127,15 @@ static const char zulu_zone[] = "Z";
 /* format_zone reads time zone information from "extern long timezone", exported
  * by <time.h>, and formats it according to RFC 3339. This differs from
  * strftime()'s "%z" format by including a colon between hour and minute. */
-static int format_zone (char *buffer, size_t buffer_size) /* {{{ */
+static int format_zone (char *buffer, size_t buffer_size, struct tm const *tm) /* {{{ */
 {
-  struct tm t_tm = { 0 };  /* The value doesn't matter. */
   char tmp[7];
   size_t sz;
 
   if ((buffer == NULL) || (buffer_size < 7))
     return EINVAL;
 
-  sz = strftime (tmp, sizeof (tmp), "%z", &t_tm);
+  sz = strftime (tmp, sizeof (tmp), "%z", tm);
   if (sz == 0)
     return ENOMEM;
   if (sz != 5)
@@ -181,7 +174,7 @@ int format_rfc3339 (char *buffer, size_t buffer_size, struct tm const *t_tm, lon
     size_left -= len;
   }
 
-  sstrncpy (buffer, zone, buffer_size);
+  sstrncpy (pos, zone, size_left);
   return 0;
 } /* }}} int format_rfc3339 */
 
@@ -207,7 +200,7 @@ int format_rfc3339_local (char *buffer, size_t buffer_size, cdtime_t t, _Bool pr
   if ((status = get_local_time (t, &t_tm, &nsec)) != 0)
     return status;  /* The error should have already be reported. */
 
-  if ((status = format_zone (zone, sizeof (zone))) != 0)
+  if ((status = format_zone (zone, sizeof (zone), &t_tm)) != 0)
     return status;
 
   return format_rfc3339 (buffer, buffer_size, &t_tm, nsec, print_nano, zone);