From 6db615c17ee7a434f9e0c40d67a1f833d8f3cc9d Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 6 Mar 2014 21:14:26 +0100
Subject: fstab-generator: merge /proc/cmdline parsing loops into one

---
 src/shared/generator.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/shared/generator.c')

diff --git a/src/shared/generator.c b/src/shared/generator.c
index 49647c1ab6..61103031db 100644
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -32,20 +32,23 @@ int generator_write_fsck_deps(
                 const char *dest,
                 const char *what,
                 const char *where,
-                const char *type) {
+                const char *fstype) {
 
         assert(f);
+        assert(dest);
+        assert(what);
+        assert(where);
 
         if (!is_device_path(what)) {
                 log_warning("Checking was requested for \"%s\", but it is not a device.", what);
                 return 0;
         }
 
-        if (type && !streq(type, "auto")) {
+        if (!isempty(fstype) && !streq(fstype, "auto")) {
                 const char *checker;
                 int r;
 
-                checker = strappenda("/sbin/fsck.", type);
+                checker = strappenda("/sbin/fsck.", fstype);
                 r = access(checker, X_OK);
                 if (r < 0) {
                         log_warning("Checking was requested for %s, but %s cannot be used: %m", what, checker);
-- 
cgit v1.2.3-54-g00ecf