chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
a83cbac
)
fstab-generator: drop mount_is_bind
author
Tom Gundersen
<teg@jklm.no>
Mon, 26 Nov 2012 23:52:01 +0000
(
00:52
+0100)
committer
Tom Gundersen
<teg@jklm.no>
Mon, 26 Nov 2012 23:56:09 +0000
(
00:56
+0100)
Do the check in-line instead, as the function is now a bit pointless.
src/fstab-generator/fstab-generator.c
patch
|
blob
|
history
diff --git
a/src/fstab-generator/fstab-generator.c
b/src/fstab-generator/fstab-generator.c
index bb4dd97b690f55c423b2a32845bbffb84941ba72..7b3bf11eda1ff3319bc00b04331f1a33dfc8c88e 100644
(file)
--- a/
src/fstab-generator/fstab-generator.c
+++ b/
src/fstab-generator/fstab-generator.c
@@
-191,12
+191,6
@@
finish:
return r;
}
-static bool mount_is_bind(struct mntent *me) {
- assert(me);
-
- return hasmntopt(me, "bind");
-}
-
static bool mount_is_network(struct mntent *me) {
assert(me);
@@
-229,7
+223,7
@@
static int add_mount(const char *what, const char *where, struct mntent *me) {
return 0;
isnetwork = mount_is_network(me);
- isbind =
mount_is_bind(me
);
+ isbind =
!!hasmntopt(me, "bind"
);
noauto = !!hasmntopt(me, "noauto");
nofail = !!hasmntopt(me, "nofail");