chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test-pty: silence a warning
[elogind.git]
/
src
/
core
/
automount.c
diff --git
a/src/core/automount.c
b/src/core/automount.c
index 77d80b2789e49bc6bbd8dcc1c5d9d7dbd73f5d3b..73a8ce17e4a7052e1e29c38cfdcb08696b7ac064 100644
(file)
--- 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;
static int automount_verify(Automount *a) {
bool b;
-
char *e
;
+
_cleanup_free_ char *e = NULL
;
assert(a);
if (UNIT(a)->load_state != UNIT_LOADED)
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);
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);
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:
return;
fail:
-
close_pipe
(p);
+
safe_close_pair
(p);
if (mounted)
repeat_unmount(a->where);
if (mounted)
repeat_unmount(a->where);