chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modernization
[elogind.git]
/
src
/
core
/
mount.c
diff --git
a/src/core/mount.c
b/src/core/mount.c
index 78393001104d131174dc18e7ef106cb5a96feab4..130dc39795a89288f1964b4ca6238a84ea14e2c3 100644
(file)
--- a/
src/core/mount.c
+++ b/
src/core/mount.c
@@
-1710,7
+1710,8
@@
static int mount_enumerate(Manager *m) {
assert(m);
if (!m->proc_self_mountinfo) {
assert(m);
if (!m->proc_self_mountinfo) {
- if (!(m->proc_self_mountinfo = fopen("/proc/self/mountinfo", "re")))
+ m->proc_self_mountinfo = fopen("/proc/self/mountinfo", "re");
+ if (!m->proc_self_mountinfo)
return -errno;
m->mount_watch.type = WATCH_MOUNT;
return -errno;
m->mount_watch.type = WATCH_MOUNT;
@@
-1724,7
+1725,8
@@
static int mount_enumerate(Manager *m) {
return -errno;
}
return -errno;
}
- if ((r = mount_load_proc_self_mountinfo(m, false)) < 0)
+ r = mount_load_proc_self_mountinfo(m, false);
+ if (r < 0)
goto fail;
return 0;
goto fail;
return 0;