From: Florian Forster <octo@collectd.org>
Date: Fri, 16 Sep 2016 07:37:57 +0000 (+0200)
Subject: src/daemon/utils_time.c: Pass "struct tm *" to format_zone().
X-Git-Tag: collectd-5.7.0~77^2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=03542f95bdf02fc0a02f16038e0c4460ddcde01f;p=collectd.git

src/daemon/utils_time.c: Pass "struct tm *" to format_zone().

This is a partial revert of e2cb258c7b6ce456f4119fd1454c85b479fa3e2d:
strptime() does not look the local timezone up itself but gets the
information from the "struct tm". If that is initialized with {0}, it
will always return the "+0000" time zone.
---

diff --git a/src/daemon/utils_time.c b/src/daemon/utils_time.c
index 77c1b688..45828b34 100644
--- a/src/daemon/utils_time.c
+++ b/src/daemon/utils_time.c
@@ -133,16 +133,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)
@@ -207,7 +206,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);