summaryrefslogtreecommitdiff
path: root/src/mount
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-04-05 14:43:06 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-04-23 23:29:29 +0200
commite2857b3d87306d93f0fba526f3e79f4f6806fb02 (patch)
tree80e0b279f908dec754abb1ee8fe497d087839026 /src/mount
parent7d991d4818dcf55916c1076003c3508c91df9934 (diff)
downloadsystemd-e2857b3d87306d93f0fba526f3e79f4f6806fb02.tar.gz
Add helper function for mnt_table_parse_{stream,mtab}
This wraps a few common steps. It is defined as inline function instead of in a .c file to avoid having a .c file. With a .c file, we would have three choices: - either link it into libshared, but then then libshared would have to be linked to libmount. - or compile the .c file into each target separately. This has the disdvantage that configuration of every target has to be updated and stuff will be compiled multiple times anyway, which is not too different from keeping this in the header file. - or create a new convenience library just for this. This also has the disadvantage that the every target would have to be updated, and a separate library for a 10 line function seems overkill. By keeping everything in a header file, we compile this a few times, but otherwise it's the least painful option. The compiler can optimize most of the function away, because it knows if 'source' is set or not.
Diffstat (limited to 'src/mount')
-rw-r--r--src/mount/mount-tool.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c
index fc18dd28d7..739f52c219 100644
--- a/src/mount/mount-tool.c
+++ b/src/mount/mount-tool.c
@@ -726,12 +726,7 @@ static int find_mount_points(const char *what, char ***list) {
/* Returns all mount points obtained from /proc/self/mountinfo in *list,
* and the number of mount points as return value. */
- table = mnt_new_table();
- iter = mnt_new_iter(MNT_ITER_FORWARD);
- if (!table || !iter)
- return log_oom();
-
- r = mnt_table_parse_mtab(table, NULL);
+ r = libmount_parse(NULL, NULL, &table, &iter);
if (r < 0)
return log_error_errno(r, "Failed to parse /proc/self/mountinfo: %m");