From: Daniel Mack <daniel@zonque.org>
Date: Mon, 12 Jan 2015 12:46:39 +0000 (+0100)
Subject: core/mount: use isempty() to check for empty strings
X-Git-Tag: v219~550
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=0c47569ac9eb365ebeb9342f47fb98d52bcc4704

core/mount: use isempty() to check for empty strings

strempty() will return an empty string in case the input parameter is
a NULL pointer. The correct test to check for an empty string is
isempty(), so use that instead.

This fixes a regression from commit 17a1c59 ("core/mount: filter out
noauto,auto,nofail,fail options").
---

diff --git a/src/core/mount.c b/src/core/mount.c
index 9f7c4d20b..5c87ed31e 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -932,7 +932,7 @@ static void mount_enter_mounting(Mount *m) {
                         r = exec_command_append(m->control_command, "-s", NULL);
                 if (r >= 0 && m->parameters_fragment.fstype)
                         r = exec_command_append(m->control_command, "-t", m->parameters_fragment.fstype, NULL);
-                if (r >= 0 && !strempty(opts))
+                if (r >= 0 && !isempty(opts))
                         r = exec_command_append(m->control_command, "-o", opts, NULL);
         } else
                 r = -ENOENT;