diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-05-04 19:10:15 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-05-05 15:08:48 +0200 |
| commit | c9816a9ac417c9a076cc11eb469b00b2eb98d572 (patch) | |
| tree | 5c0b9ea49699edb16ab8b5c0183ffddeb9ea464f /src/basic | |
| parent | 73ce91a05a63f44367b48a7ef3ca1ce4e85205b3 (diff) | |
| download | systemd-c9816a9ac417c9a076cc11eb469b00b2eb98d572.tar.gz | |
basic/time-util: use _cleanup_ in one more place
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/time-util.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/basic/time-util.c b/src/basic/time-util.c index 78d0390a00..6b3b42254d 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c @@ -1278,8 +1278,8 @@ int get_timezones(char ***ret) { f = fopen("/usr/share/zoneinfo/zone1970.tab", "re"); if (f) { for (;;) { - _cleanup_free_ char *line = NULL; - char *p, *w; + _cleanup_free_ char *line = NULL, *w = NULL; + char *p; size_t k; r = read_line(f, LONG_LINE_MAX, &line); @@ -1310,12 +1310,10 @@ int get_timezones(char ***ret) { if (!w) return -ENOMEM; - if (!GREEDY_REALLOC(zones, n_allocated, n_zones + 2)) { - free(w); + if (!GREEDY_REALLOC(zones, n_allocated, n_zones + 2)) return -ENOMEM; - } - zones[n_zones++] = w; + zones[n_zones++] = TAKE_PTR(w); zones[n_zones] = NULL; } |