diff options
| author | Evgeny Vereshchagin <evvers@ya.ru> | 2017-01-25 16:31:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-25 16:31:11 +0300 |
| commit | a27f0651a06c3ad13bcafe72566479482c846532 (patch) | |
| tree | e7748b766b7d4f00efd062d8664a1c9ea8159ca9 /src | |
| parent | 0067c7b29ab996bf99cf1bafe63c118b9b6d5b56 (diff) | |
| parent | c6d92582205065e4924b9f0cb1428f4a5f210fd4 (diff) | |
Merge pull request #5152 from keszybz/strv-free
Use strv_free where appropriate
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/dbus.c | 4 | ||||
| -rw-r--r-- | src/core/execute.c | 6 | ||||
| -rw-r--r-- | src/resolve/resolved-link-bus.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/core/dbus.c b/src/core/dbus.c index 1f9bf2085f..a3f701c064 100644 --- a/src/core/dbus.c +++ b/src/core/dbus.c @@ -477,7 +477,7 @@ static int bus_kill_context_find(sd_bus *bus, const char *path, const char *inte } static int bus_job_enumerate(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error) { - _cleanup_free_ char **l = NULL; + _cleanup_strv_free_ char **l = NULL; Manager *m = userdata; unsigned k = 0; Iterator i; @@ -504,7 +504,7 @@ static int bus_job_enumerate(sd_bus *bus, const char *path, void *userdata, char } static int bus_unit_enumerate(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error) { - _cleanup_free_ char **l = NULL; + _cleanup_strv_free_ char **l = NULL; Manager *m = userdata; unsigned k = 0; Iterator i; diff --git a/src/core/execute.c b/src/core/execute.c index 06a291fd39..d0faba5a85 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -1896,8 +1896,8 @@ static int compile_read_write_paths( _cleanup_strv_free_ char **l = NULL; char **rt; - /* Compile the list of writable paths. This is the combination of the explicitly configured paths, plus all - * runtime directories. */ + /* Compile the list of writable paths. This is the combination of + * the explicitly configured paths, plus all runtime directories. */ if (strv_isempty(context->read_write_paths) && strv_isempty(context->runtime_directory)) { @@ -1930,7 +1930,7 @@ static int apply_mount_namespace(Unit *u, const ExecContext *context, const ExecParameters *params, ExecRuntime *runtime) { int r; - _cleanup_free_ char **rw = NULL; + _cleanup_strv_free_ char **rw = NULL; char *tmp = NULL, *var = NULL; const char *root_dir = NULL; NameSpaceInfo ns_info = { diff --git a/src/resolve/resolved-link-bus.c b/src/resolve/resolved-link-bus.c index 364812250f..59cd6cf1cb 100644 --- a/src/resolve/resolved-link-bus.c +++ b/src/resolve/resolved-link-bus.c @@ -462,7 +462,7 @@ int bus_link_method_set_dnssec(sd_bus_message *message, void *userdata, sd_bus_e int bus_link_method_set_dnssec_negative_trust_anchors(sd_bus_message *message, void *userdata, sd_bus_error *error) { _cleanup_set_free_free_ Set *ns = NULL; - _cleanup_free_ char **ntas = NULL; + _cleanup_strv_free_ char **ntas = NULL; Link *l = userdata; int r; char **i; |