From 1d8ce41318710e1b1f513b00bdc7357015b8735c Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Fri, 6 Dec 2024 17:49:44 +0100 Subject: [PATCH] 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. --- src/fstab-generator/fstab-generator.c | 2 +- src/shared/generator.c | 9 ++++++--- src/shared/generator.h | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index 6b7445b201d..f3f435c6853 100644 --- 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 ceb26c570d9..0564e2e9e32 100644 --- 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 e3f1197205f..675af99f3ca 100644 --- 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, -- 2.47.3