shared/generator: rename generator_write_device_deps() to _network_device_deps

The previous name was awfully vague. Let's be specific that this
is about _netdev only.

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 6b7445b201d9b306727061e69c61f069a0129a0a..f3f435c685385249f220b137dcf6320555c1b990 100644 (file)
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -674,7 +674,7 @@ static int add_mount(
         if (r < 0)
                 return r;
 
-        r = generator_write_device_deps(dest, what, where, opts);
+        r = generator_write_network_device_deps(dest, what, where, opts);
         if (r < 0)
                 return r;
 

diff --git a/src/shared/generator.c b/src/shared/generator.c
index ceb26c570d9eac6cf6e69531f41d1c4fbfc2db8e..0564e2e9e324d421e6f77c930238d273aaa1cd3c 100644 (file)
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -421,7 +421,7 @@ int generator_write_timeouts(
                                     timeout);
 }
 
-int generator_write_device_deps(
+int generator_write_network_device_deps(
                 const char *dir,
                 const char *what,
                 const char *where,
@@ -435,6 +435,10 @@ int generator_write_device_deps(
         _cleanup_free_ char *node = NULL, *unit = NULL;
         int r;
 
+        assert(dir);
+        assert(what);
+        assert(where);
+
         if (fstab_is_extrinsic(where, opts))
                 return 0;
 
@@ -451,8 +455,7 @@ int generator_write_device_deps(
 
         r = unit_name_from_path(node, ".device", &unit);
         if (r < 0)
-                return log_error_errno(r, "Failed to make unit name from path \"%s\": %m",
-                                       node);
+                return log_error_errno(r, "Failed to make unit name from path \"%s\": %m", node);
 
         /* See mount_add_default_dependencies for explanation why we create such
          * dependencies. */

diff --git a/src/shared/generator.h b/src/shared/generator.h
index e3f1197205f5c4dcdefcab3a5598db9027ee808f..675af99f3ca1b23f2a687c3c0df1d1f245add24a 100644 (file)
--- a/src/shared/generator.h
+++ b/src/shared/generator.h
@@ -32,7 +32,7 @@ int generator_write_timeouts(
 
 int generator_write_blockdev_dependency(FILE *f, const char *what);
 
-int generator_write_device_deps(
+int generator_write_network_device_deps(
         const char *dir,
         const char *what,
         const char *where,