strptime: Use detected results of the existence of tm_zone member

Signed-off-by: Hiroshi Hatake <[email protected]>

Author: cosmo0920

include/fluent-bit/flb_time.h

@@ -32,7 +32,7 @@ struct flb_time {
 
 struct flb_tm {
     struct tm tm;
-#ifdef FLB_HAVE_TIME_ZONE
+#ifndef FLB_HAVE_TIME_ZONE
     char *tm_zone;
 #endif
 #ifndef FLB_HAVE_GMTOFF
@@ -46,6 +46,12 @@ struct flb_tm {
 #define flb_tm_gmtoff(x) (x)->tm.tm_gmtoff
 #endif
 
+#ifndef FLB_HAVE_TIME_ZONE
+#define flb_tm_zone(x) (x)->tm_zone
+#else
+#define flb_tm_zone(x) (x)->tm.tm_zone
+#endif
+
 /*
    to represent eventtime of fluentd
    see also

src/flb_strptime.c

@@ -519,15 +519,13 @@ again:		switch (c = *fmt++) {
 					return (NULL);
 				flb_tm_gmtoff(tm) = 0;
 				tm->tm.tm_isdst = 0;
-#ifdef FLB_HAVE_TIME_ZONE
-				tm->tm_zone = "UTC";
+				flb_tm_zone(tm) = "UTC";
 				for(i=0; flb_known_timezones[i].abbr != NULL; ++i) { /* Prefer "UTC" from list if available */
 					if (strcmp(flb_known_timezones[i].abbr, "UTC") == 0) {
-						tm->tm_zone = flb_known_timezones[i].abbr;
+						flb_tm_zone(tm) = flb_known_timezones[i].abbr;
 						break;
 					}
 				}
-#endif
 				fields = 0xffff;         /* everything */
 			}
 			break;
@@ -606,9 +604,7 @@ again:		switch (c = *fmt++) {
 					if (!isalnum((unsigned char)bp[abbr_len])) {
 						tm->tm.tm_isdst = tz_info->is_dst;
 						flb_tm_gmtoff(tm) = tz_info->offset_sec;
-#ifdef FLB_HAVE_TIME_ZONE
-						tm->tm_zone = tz_info->abbr;
-#endif
+						flb_tm_zone(tm) = tz_info->abbr;
 						bp += abbr_len;
 						found_in_known = 1;
 						break;
@@ -627,16 +623,12 @@ again:		switch (c = *fmt++) {
 				if (strncmp((const char *)bp, gmt, 3) == 0) {
 					tm->tm.tm_isdst = 0;
 					flb_tm_gmtoff(tm) = 0;
-#ifdef FLB_HAVE_TIME_ZONE
-					tm->tm_zone = gmt;
-#endif
+					flb_tm_zone(tm) = gmt;
 					bp += 3;
 				} else if (strncmp((const char *)bp, utc, 3) == 0) {
 					tm->tm.tm_isdst = 0;
 					flb_tm_gmtoff(tm) = 0;
-#ifdef FLB_HAVE_TIME_ZONE
-					tm->tm_zone = utc;
-#endif
+					flb_tm_zone(tm) = utc;
 					bp += 3;
 				} else {
 					ep = _find_string(bp, &i, (const char * const *)tzname, NULL, 2);
@@ -661,9 +653,7 @@ again:		switch (c = *fmt++) {
 #else
 					flb_tm_gmtoff(tm) = -(timezone);
 #endif
-#ifdef FLB_HAVE_TIME_ZONE
-					tm->tm_zone = tzname[i];
-#endif
+					flb_tm_zone(tm) = tzname[i];
 					bp = ep;
 				}
 			}
@@ -697,9 +687,7 @@ again:		switch (c = *fmt++) {
 					return NULL;
 				tm->tm.tm_isdst = 0;
 				flb_tm_gmtoff(tm) = 0;
-#ifdef FLB_HAVE_TIME_ZONE
-				tm->tm_zone = "GMT"; /* Original had global gmt array */
-#endif
+				flb_tm_zone(tm) = "GMT"; /* Original had global gmt array */
 				continue;
 			case 'U':
 				if (*bp++ != 'T')
@@ -709,16 +697,12 @@ again:		switch (c = *fmt++) {
 					bp++; /* Allow "UTC" */
 				tm->tm.tm_isdst = 0;
 				flb_tm_gmtoff(tm) = 0;
-#ifdef FLB_HAVE_TIME_ZONE
-				tm->tm_zone = "UTC"; /* Original had global utc array */
-#endif
+				flb_tm_zone(tm) = "UTC"; /* Original had global utc array */
 				continue;
 			case 'Z':
 				tm->tm.tm_isdst = 0;
 				flb_tm_gmtoff(tm) = 0;
-#ifdef FLB_HAVE_TIME_ZONE
-				tm->tm_zone = utc;
-#endif
+				flb_tm_zone(tm) = utc;
 				continue;
 			case '+':
 				neg = 0;
@@ -732,19 +716,15 @@ again:		switch (c = *fmt++) {
 				if (ep != NULL) {
 					flb_tm_gmtoff(tm) = (-5 - i) * SECSPERHOUR;
 					tm->tm.tm_isdst = 0;
-#ifdef FLB_HAVE_TIME_ZONE
-					tm->tm_zone = (char *)nast[i];
-#endif
+					flb_tm_zone(tm)  = (char *)nast[i];
 					bp = ep;
 					continue;
 				}
 				ep = _find_string(bp, &i, nadt, NULL, 4);
 				if (ep != NULL) {
 					tm->tm.tm_isdst = 1;
 					flb_tm_gmtoff(tm) = (-4 - i) * SECSPERHOUR;
-#ifdef FLB_HAVE_TIME_ZONE
-					tm->tm_zone = (char *)nadt[i];
-#endif
+					flb_tm_zone(tm)  = (char *)nadt[i];
 					bp = ep;
 					continue;
 				}
@@ -766,9 +746,7 @@ again:		switch (c = *fmt++) {
 				offs = -offs;
 			tm->tm.tm_isdst = 0;	/* XXX */
 			flb_tm_gmtoff(tm) = offs;
-#ifdef FLB_HAVE_TIME_ZONE
-			tm->tm_zone = NULL;	/* XXX */
-#endif
+			flb_tm_zone(tm) = NULL;	/* XXX */
 			continue;
 
 		/*