X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fautomount.c;h=73a8ce17e4a7052e1e29c38cfdcb08696b7ac064;hb=671174136525ddf208cdbe75d6d6bd159afa961f;hp=77d80b2789e49bc6bbd8dcc1c5d9d7dbd73f5d3b;hpb=03e334a1c7dc8c20c38902aa039440763acc9b17;p=elogind.git diff --git a/src/core/automount.c b/src/core/automount.c index 77d80b278..73a8ce17e 100644 --- a/src/core/automount.c +++ b/src/core/automount.c @@ -144,7 +144,7 @@ static int automount_add_default_dependencies(Automount *a) { static int automount_verify(Automount *a) { bool b; - char *e; + _cleanup_free_ char *e = NULL; assert(a); if (UNIT(a)->load_state != UNIT_LOADED) @@ -160,7 +160,6 @@ static int automount_verify(Automount *a) { 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); @@ -532,7 +531,7 @@ static void automount_enter_waiting(Automount *a) { return; fail: - close_pipe(p); + safe_close_pair(p); if (mounted) repeat_unmount(a->where);