From 5dc631d19f6031cdbc426c9719affa4af858b35a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Fri, 30 Nov 2018 14:09:22 +0100 Subject: [PATCH] block: simplify code picking mount target directory MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Using a set of 3 conditional block each setting "target" variable makes code easier to follow. Signed-off-by: Rafał Miłecki Reviewed-by: Michael Heimpold --- block.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/block.c b/block.c index f42d0d6..0671aca 100644 --- a/block.c +++ b/block.c @@ -1025,8 +1025,8 @@ static int mount_device(struct probe_info *pr, int type) blockd_notify(device, m, pr); if (m) { - char *target = m->target; char _target[32]; + char *target; int err = 0; switch (type) { @@ -1049,8 +1049,9 @@ static int mount_device(struct probe_info *pr, int type) if (m->autofs) { snprintf(_target, sizeof(_target), "/tmp/run/blockd/%s", device); target = _target; - } - if (!target) { + } else if (m->target) { + target = m->target; + } else { snprintf(_target, sizeof(_target), "/mnt/%s", device); target = _target; } -- 2.25.1