diff options
author | Ken Murchison <murch@fastmail.com> | 2021-09-15 10:04:54 -0400 |
---|---|---|
committer | Ken Murchison <murch@fastmail.com> | 2021-09-15 10:04:54 -0400 |
commit | e1367e488e034625caae929e790ac3f6a5c06be7 (patch) | |
tree | 43267e169943e7fd45dc47e4743e23449a5559bf | |
parent | 15cf1ddf5331f828adc59ac74be83c7b119f5542 (diff) | |
download | libical-git-tzid_prefix_fix.tar.gz |
icaltimezone.c: actually use the icaltimezone_set_tzid_prefix() value, even if emptytzid_prefix_fix
-rw-r--r-- | src/libical/icaltimezone.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/libical/icaltimezone.c b/src/libical/icaltimezone.c index e57c08d2..ba0f95a1 100644 --- a/src/libical/icaltimezone.c +++ b/src/libical/icaltimezone.c @@ -75,7 +75,7 @@ static struct _compat_tzids { }; /* The prefix to be used for tzid's generated from system tzdata */ -static char s_ical_tzid_prefix[BUILTIN_TZID_PREFIX_LEN] = {0}; +static char s_ical_tzid_prefix[BUILTIN_TZID_PREFIX_LEN] = BUILTIN_TZID_PREFIX; /** This is the filename of the file containing the city names and coordinates of all the builtin timezones. */ @@ -202,9 +202,6 @@ static void icaltimezone_changes_unlock(void) const char *icaltimezone_tzid_prefix(void) { - if (s_ical_tzid_prefix[0] == '\0') { - strncpy(s_ical_tzid_prefix, BUILTIN_TZID_PREFIX, BUILTIN_TZID_PREFIX_LEN-1); - } return s_ical_tzid_prefix; } |