From 10c03e9e82258fee9a9af4c4eacdc4af1e52680c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 11 Jul 2015 14:20:38 -0300 Subject: basic: simplify path_is_mount_point() a bit This removes two uses of the ternary operator. --- src/basic/path-util.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/basic/path-util.c b/src/basic/path-util.c index 8f49d6526..5cbfc145a 100644 --- a/src/basic/path-util.c +++ b/src/basic/path-util.c @@ -656,9 +656,11 @@ int path_is_mount_point(const char *t, int flags) { canonical = canonicalize_file_name(t); if (!canonical) return -errno; + + t = canonical; } - r = path_get_parent(canonical ?: t, &parent); + r = path_get_parent(t, &parent); if (r < 0) return r; @@ -666,7 +668,7 @@ int path_is_mount_point(const char *t, int flags) { if (fd < 0) return -errno; - return fd_is_mount_point(fd, basename(canonical ?: t), flags); + return fd_is_mount_point(fd, basename(t), flags); } int path_is_read_only_fs(const char *path) { -- cgit v1.2.3