shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

Merge pull request #12866 from yuwata/strv_consume_cleanups

Browse Source 
tree-wide: use _cleanup_ attributes
This commit is contained in:
Lennart Poettering 2019-06-24 09:54:36 +02:00 committed by GitHub
commit 0d92a3088a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/basic/terminal-util.c
View File

@ -720,8 +720,7 @@ int get_kernel_consoles(char ***ret) {
p = line;
for (;;) {
_cleanup_free_ char *tty = NULL;
char *path;
_cleanup_free_ char *tty = NULL, *path = NULL;
r = extract_first_word(&p, &tty, NULL, 0);
if (r < 0)
@ -736,17 +735,16 @@ int get_kernel_consoles(char ***ret) {
return r;
}
path = strappend("/dev/", tty);
path = path_join("/dev", tty);
if (!path)
return -ENOMEM;
if (access(path, F_OK) < 0) {
log_debug_errno(errno, "Console device %s is not accessible, skipping: %m", path);
free(path);
continue;
}
r = strv_consume(&l, path);
r = strv_consume(&l, TAKE_PTR(path));
if (r < 0)
return r;
}

9
src/core/dbus-execute.c
View File

@ -2108,22 +2108,19 @@ int bus_exec_context_set_transient_property(
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Path %s is not absolute.", path);
if (!UNIT_WRITE_FLAGS_NOOP(flags)) {
_cleanup_free_ char *q = NULL;
char *buf;
_cleanup_free_ char *q = NULL, *buf = NULL;
buf = strjoin(b ? "-" : "", path);
if (!buf)
return -ENOMEM;
q = specifier_escape(buf);
if (!q) {
free(buf);
if (!q)
return -ENOMEM;
}
fprintf(f, "EnvironmentFile=%s\n", q);
r = strv_consume(&l, buf);
r = strv_consume(&l, TAKE_PTR(buf));
if (r < 0)
return r;
}

8
src/import/pull-common.c
View File

@ -61,8 +61,8 @@ int pull_find_old_etags(
}
FOREACH_DIRENT_ALL(de, d, return -errno) {
_cleanup_free_ char *u = NULL;
const char *a, *b;
char *u;
if (de->d_type != DT_UNKNOWN &&
de->d_type != dt)
@ -97,12 +97,10 @@ int pull_find_old_etags(
if (r < 0)
return r;
if (!http_etag_is_valid(u)) {
free(u);
if (!http_etag_is_valid(u))
continue;
}
r = strv_consume(&l, u);
r = strv_consume(&l, TAKE_PTR(u));
if (r < 0)
return r;
}

19
src/libsystemd/sd-path/sd-path.c
View File

@ -388,9 +388,9 @@ static int search_from_environment(
bool env_search_sufficient,
const char *first, ...) {
_cleanup_strv_free_ char **l = NULL;
const char *e;
char *h = NULL;
char **l = NULL;
int r;
assert(list);
@ -403,7 +403,7 @@ static int search_from_environment(
return -ENOMEM;
if (env_search_sufficient) {
*list = l;
*list = TAKE_PTR(l);
return 0;
}
}
@ -424,10 +424,8 @@ static int search_from_environment(
e = secure_getenv(env_home);
if (e && path_is_absolute(e)) {
h = strdup(e);
if (!h) {
strv_free(l);
if (!h)
return -ENOMEM;
}
}
}
@ -435,23 +433,18 @@ static int search_from_environment(
e = secure_getenv("HOME");
if (e && path_is_absolute(e)) {
h = path_join(e, home_suffix);
if (!h) {
strv_free(l);
if (!h)
return -ENOMEM;
}
}
}
if (h) {
r = strv_consume_prepend(&l, h);
if (r < 0) {
strv_free(l);
if (r < 0)
return -ENOMEM;
}
}
*list = l;
*list = TAKE_PTR(l);
return 0;
}

16
src/resolve/resolvectl.c
View File

@ -1229,7 +1229,7 @@ static int map_link_dns_servers(sd_bus *bus, const char *member, sd_bus_message
return r;
for (;;) {
char *pretty = NULL;
_cleanup_free_ char *pretty = NULL;
r = read_dns_server_one(m, false, &pretty);
if (r < 0)
@ -1240,7 +1240,7 @@ static int map_link_dns_servers(sd_bus *bus, const char *member, sd_bus_message
if (isempty(pretty))
continue;
r = strv_consume(l, pretty);
r = strv_consume(l, TAKE_PTR(pretty));
if (r < 0)
return r;
}
@ -1306,7 +1306,7 @@ static int map_link_domains(sd_bus *bus, const char *member, sd_bus_message *m,
return r;
for (;;) {
char *pretty = NULL;
_cleanup_free_ char *pretty = NULL;
r = read_domain_one(m, false, &pretty);
if (r < 0)
@ -1317,7 +1317,7 @@ static int map_link_domains(sd_bus *bus, const char *member, sd_bus_message *m,
if (isempty(pretty))
continue;
r = strv_consume(l, pretty);
r = strv_consume(l, TAKE_PTR(pretty));
if (r < 0)
return r;
}
@ -1536,7 +1536,7 @@ static int map_global_dns_servers(sd_bus *bus, const char *member, sd_bus_messag
return r;
for (;;) {
char *pretty = NULL;
_cleanup_free_ char *pretty = NULL;
r = read_dns_server_one(m, true, &pretty);
if (r < 0)
@ -1547,7 +1547,7 @@ static int map_global_dns_servers(sd_bus *bus, const char *member, sd_bus_messag
if (isempty(pretty))
continue;
r = strv_consume(l, pretty);
r = strv_consume(l, TAKE_PTR(pretty));
if (r < 0)
return r;
}
@ -1580,7 +1580,7 @@ static int map_global_domains(sd_bus *bus, const char *member, sd_bus_message *m
return r;
for (;;) {
char *pretty = NULL;
_cleanup_free_ char *pretty = NULL;
r = read_domain_one(m, true, &pretty);
if (r < 0)
@ -1591,7 +1591,7 @@ static int map_global_domains(sd_bus *bus, const char *member, sd_bus_message *m
if (isempty(pretty))
continue;
r = strv_consume(l, pretty);
r = strv_consume(l, TAKE_PTR(pretty));
if (r < 0)
return r;
}