core: replace unnecessary use of set_free_free() with set_free()
These variables are assigned with set_put_strv(), hence string_hash_ops_free is used. This also drops unnecessary call of set_ensure_allocated() with wrong hash ops.
This commit is contained in:
+1
-1
@@ -620,7 +620,7 @@ void cgroup_context_done(CGroupContext *c) {
|
||||
while (c->bpf_foreign_programs)
|
||||
cgroup_context_remove_bpf_foreign_program(c, c->bpf_foreign_programs);
|
||||
|
||||
c->restrict_network_interfaces = set_free_free(c->restrict_network_interfaces);
|
||||
c->restrict_network_interfaces = set_free(c->restrict_network_interfaces);
|
||||
|
||||
cpu_set_reset(&c->cpuset_cpus);
|
||||
cpu_set_reset(&c->startup_cpuset_cpus);
|
||||
|
||||
@@ -2218,7 +2218,7 @@ int bus_cgroup_set_property(
|
||||
|
||||
if (strv_isempty(l)) {
|
||||
c->restrict_network_interfaces_is_allow_list = false;
|
||||
c->restrict_network_interfaces = set_free_free(c->restrict_network_interfaces);
|
||||
c->restrict_network_interfaces = set_free(c->restrict_network_interfaces);
|
||||
|
||||
unit_write_settingf(u, flags, name, "%s=", name);
|
||||
return 1;
|
||||
|
||||
@@ -1862,8 +1862,8 @@ int bus_exec_context_set_transient_property(
|
||||
|
||||
if (!UNIT_WRITE_FLAGS_NOOP(flags)) {
|
||||
if (strv_isempty(allow_list) && strv_isempty(deny_list)) {
|
||||
c->log_filter_allowed_patterns = set_free_free(c->log_filter_allowed_patterns);
|
||||
c->log_filter_denied_patterns = set_free_free(c->log_filter_denied_patterns);
|
||||
c->log_filter_allowed_patterns = set_free(c->log_filter_allowed_patterns);
|
||||
c->log_filter_denied_patterns = set_free(c->log_filter_denied_patterns);
|
||||
unit_write_settingf(u, flags, name, "%s=", name);
|
||||
} else {
|
||||
r = set_put_strdupv(&c->log_filter_allowed_patterns, allow_list);
|
||||
@@ -2240,7 +2240,7 @@ int bus_exec_context_set_transient_property(
|
||||
|
||||
if (strv_isempty(l)) {
|
||||
c->restrict_filesystems_allow_list = false;
|
||||
c->restrict_filesystems = set_free_free(c->restrict_filesystems);
|
||||
c->restrict_filesystems = set_free(c->restrict_filesystems);
|
||||
|
||||
unit_write_setting(u, flags, name, "RestrictFileSystems=");
|
||||
return 1;
|
||||
|
||||
@@ -1089,10 +1089,6 @@ static int exec_cgroup_context_deserialize(CGroupContext *c, FILE *f) {
|
||||
|
||||
LIST_PREPEND(socket_bind_items, c->socket_bind_deny, item);
|
||||
} else if ((val = startswith(l, "exec-cgroup-context-restrict-network-interfaces="))) {
|
||||
r = set_ensure_allocated(&c->restrict_network_interfaces, &string_hash_ops);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
r = set_put_strdup(&c->restrict_network_interfaces, val);
|
||||
if (r < 0)
|
||||
return r;
|
||||
@@ -3547,10 +3543,6 @@ static int exec_context_deserialize(ExecContext *c, FILE *f) {
|
||||
if (r < 0)
|
||||
return r;
|
||||
} else if ((val = startswith(l, "exec-context-restrict-filesystems="))) {
|
||||
r = set_ensure_allocated(&c->restrict_filesystems, &string_hash_ops);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
r = set_put_strdup(&c->restrict_filesystems, val);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
+3
-3
@@ -705,7 +705,7 @@ void exec_context_done(ExecContext *c) {
|
||||
c->apparmor_profile = mfree(c->apparmor_profile);
|
||||
c->smack_process_label = mfree(c->smack_process_label);
|
||||
|
||||
c->restrict_filesystems = set_free_free(c->restrict_filesystems);
|
||||
c->restrict_filesystems = set_free(c->restrict_filesystems);
|
||||
|
||||
c->syscall_filter = hashmap_free(c->syscall_filter);
|
||||
c->syscall_archs = set_free(c->syscall_archs);
|
||||
@@ -718,8 +718,8 @@ void exec_context_done(ExecContext *c) {
|
||||
c->log_level_max = -1;
|
||||
|
||||
exec_context_free_log_extra_fields(c);
|
||||
c->log_filter_allowed_patterns = set_free_free(c->log_filter_allowed_patterns);
|
||||
c->log_filter_denied_patterns = set_free_free(c->log_filter_denied_patterns);
|
||||
c->log_filter_allowed_patterns = set_free(c->log_filter_allowed_patterns);
|
||||
c->log_filter_denied_patterns = set_free(c->log_filter_denied_patterns);
|
||||
|
||||
c->log_ratelimit = (RateLimit) {};
|
||||
|
||||
|
||||
@@ -3653,7 +3653,7 @@ int config_parse_restrict_filesystems(
|
||||
|
||||
if (isempty(rvalue)) {
|
||||
/* Empty assignment resets the list */
|
||||
c->restrict_filesystems = set_free_free(c->restrict_filesystems);
|
||||
c->restrict_filesystems = set_free(c->restrict_filesystems);
|
||||
c->restrict_filesystems_allow_list = false;
|
||||
return 0;
|
||||
}
|
||||
@@ -6056,7 +6056,7 @@ int config_parse_restrict_network_interfaces(
|
||||
|
||||
if (isempty(rvalue)) {
|
||||
/* Empty assignment resets the list */
|
||||
c->restrict_network_interfaces = set_free_free(c->restrict_network_interfaces);
|
||||
c->restrict_network_interfaces = set_free(c->restrict_network_interfaces);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -6681,8 +6681,8 @@ int config_parse_log_filter_patterns(
|
||||
|
||||
if (isempty(pattern)) {
|
||||
/* Empty assignment resets the lists. */
|
||||
c->log_filter_allowed_patterns = set_free_free(c->log_filter_allowed_patterns);
|
||||
c->log_filter_denied_patterns = set_free_free(c->log_filter_denied_patterns);
|
||||
c->log_filter_allowed_patterns = set_free(c->log_filter_allowed_patterns);
|
||||
c->log_filter_denied_patterns = set_free(c->log_filter_denied_patterns);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user