fstab-generator: merge /proc/cmdline parsing loops into one

[elogind.git] / src / shared / generator.c

diff --git a/src/shared/generator.c b/src/shared/generator.c
index 49647c1ab6b55857ff687ae350fb1dd27ad14cbc..61103031db23b31df7a5d7c79dc98d11608a3d4a 100644 (file)
--- 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);