SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

time: simplify get_timezones()

Browse Source 
The function can be simplified by using extract_many_words() and strv_extend()
This commit is contained in:
Dan Streetman
2021-06-30 13:42:58 -04:00
parent 58551e6ebc
commit 31097e2b99
1 changed files with 19 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/time-util.c
+19 -37
View File
@@ -1265,23 +1265,14 @@ int parse_nsec(const char *t, nsec_t *nsec) {
int get_timezones(char ***ret) {
_cleanup_fclose_ FILE *f = NULL;
_cleanup_strv_free_ char **zones = NULL;
size_t n_zones = 0;
int r;
assert(ret);
zones = strv_new("UTC");
if (!zones)
return -ENOMEM;
n_zones = 1;
f = fopen("/usr/share/zoneinfo/zone1970.tab", "re");
if (f) {
for (;;) {
_cleanup_free_ char *line = NULL, *w = NULL;
char *p;
size_t k;
_cleanup_free_ char *line = NULL, *cc = NULL, *co = NULL, *tz = NULL;
r = read_line(f, LONG_LINE_MAX, &line);
if (r < 0)
@@ -1289,43 +1280,34 @@ int get_timezones(char ***ret) {
if (r == 0)
break;
p = strstrip(line);
const char *p = line;
if (isempty(p) || *p == '#')
/* Line format is:
* 'country codes' 'coordinates' 'timezone' 'comments' */
r = extract_many_words(&p, NULL, 0, &cc, &co, &tz, NULL);
if (r < 0)
continue;
/* Skip over country code */
p += strcspn(p, WHITESPACE);
p += strspn(p, WHITESPACE);
/* Skip over coordinates */
p += strcspn(p, WHITESPACE);
p += strspn(p, WHITESPACE);
/* Found timezone name */
k = strcspn(p, WHITESPACE);
if (k <= 0)
/* Lines that start with # are comments. */
if (*cc == '#')
continue;
w = strndup(p, k);
if (!w)
return -ENOMEM;
if (!GREEDY_REALLOC(zones, n_zones + 2))
return -ENOMEM;
zones[n_zones++] = TAKE_PTR(w);
zones[n_zones] = NULL;
r = strv_extend(&zones, tz);
if (r < 0)
return r;
}
strv_sort(zones);
strv_uniq(zones);
} else if (errno != ENOENT)
return -errno;
*ret = TAKE_PTR(zones);
/* Always include UTC */
r = strv_extend(&zones, "UTC");
if (r < 0)
return -ENOMEM;
strv_sort(zones);
strv_uniq(zones);
*ret = TAKE_PTR(zones);
return 0;
}