static int automount_verify(Automount *a) {
bool b;
- char *e;
+ _cleanup_free_ char *e = NULL;
assert(a);
if (UNIT(a)->load_state != UNIT_LOADED)
return -ENOMEM;
b = unit_has_name(UNIT(a), e);
- free(e);
if (!b) {
log_error_unit(UNIT(a)->id, "%s's Where setting doesn't match unit name. Refusing.", UNIT(a)->id);
return;
fail:
- close_pipe(p);
+ safe_close_pair(p);
if (mounted)
repeat_unmount(a->where);
log_debug_unit(u->id, "Failed to parse token value %s", value);
else {
if (!a->tokens)
- if (!(a->tokens = set_new(trivial_hash_func, trivial_compare_func)))
+ if (!(a->tokens = set_new(NULL)))
return -ENOMEM;
r = set_put(a->tokens, UINT_TO_PTR(token));
} else
log_debug_unit(UNIT(a)->id, "Got direct mount request on %s", a->where);
- r = set_ensure_allocated(&a->tokens, trivial_hash_func, trivial_compare_func);
+ r = set_ensure_allocated(&a->tokens, NULL);
if (r < 0) {
log_error_unit(UNIT(a)->id, "Failed to allocate token set.");
goto fail;