From e82d4edd20eb6fbde2a0dcf515c7eca8cad65edb Mon Sep 17 00:00:00 2001
From: Mike Yuan <me@yhndnzj.com>
Date: Fri, 6 Dec 2024 17:46:03 +0100
Subject: [PATCH] shared/generator: trivial coding style cleanups

---
 src/shared/generator.c | 15 +++----------
 src/shared/generator.h | 50 ++++++++++++++++--------------------------
 2 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/src/shared/generator.c b/src/shared/generator.c
index b3e57770aa7..ceb26c570d9 100644
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -787,10 +787,7 @@ int generator_enable_remount_fs_service(const char *dir) {
                                      SYSTEM_DATA_UNIT_DIR "/" SPECIAL_REMOUNT_FS_SERVICE);
 }
 
-int generator_write_blockdev_dependency(
-                FILE *f,
-                const char *what) {
-
+int generator_write_blockdev_dependency(FILE *f, const char *what) {
         _cleanup_free_ char *escaped = NULL;
         int r;
 
@@ -811,10 +808,7 @@ int generator_write_blockdev_dependency(
         return 0;
 }
 
-int generator_write_cryptsetup_unit_section(
-                FILE *f,
-                const char *source) {
-
+int generator_write_cryptsetup_unit_section(FILE *f, const char *source) {
         assert(f);
 
         fprintf(f,
@@ -886,10 +880,7 @@ int generator_write_cryptsetup_service_section(
         return 0;
 }
 
-int generator_write_veritysetup_unit_section(
-                FILE *f,
-                const char *source) {
-
+int generator_write_veritysetup_unit_section(FILE *f, const char *source) {
         assert(f);
 
         fprintf(f,
diff --git a/src/shared/generator.h b/src/shared/generator.h
index f07d7d6b3ae..e3f1197205f 100644
--- a/src/shared/generator.h
+++ b/src/shared/generator.h
@@ -7,13 +7,11 @@
 #include "main-func.h"
 
 int generator_open_unit_file_full(const char *dest, const char *source, const char *name, FILE **ret_file, char **ret_final_path, char **ret_temp_path);
-
 static inline int generator_open_unit_file(const char *dest, const char *source, const char *name, FILE **ret_file) {
         return generator_open_unit_file_full(dest, source, name, ret_file, NULL, NULL);
 }
 
 int generator_add_symlink_full(const char *dir, const char *dst, const char *dep_type, const char *src, const char *instance);
-
 static inline int generator_add_symlink(const char *dir, const char *dst, const char *dep_type, const char *src) {
         return generator_add_symlink_full(dir, dst, dep_type, src, NULL);
 }
@@ -32,32 +30,7 @@ int generator_write_timeouts(
         const char *opts,
         char **filtered);
 
-int generator_write_blockdev_dependency(
-                FILE *f,
-                const char *what);
-
-int generator_write_cryptsetup_unit_section(
-                FILE *f,
-                const char *source);
-
-int generator_write_cryptsetup_service_section(
-                FILE *f,
-                const char *name,
-                const char *what,
-                const char *password,
-                const char *options);
-
-int generator_write_veritysetup_unit_section(
-                FILE *f,
-                const char *source);
-
-int generator_write_veritysetup_service_section(
-                FILE *f,
-                const char *name,
-                const char *data_what,
-                const char *hash_what,
-                const char *roothash,
-                const char *options);
+int generator_write_blockdev_dependency(FILE *f, const char *what);
 
 int generator_write_device_deps(
         const char *dir,
@@ -65,9 +38,7 @@ int generator_write_device_deps(
         const char *where,
         const char *opts);
 
-int generator_write_initrd_root_device_deps(
-        const char *dir,
-        const char *what);
+int generator_write_initrd_root_device_deps(const char *dir, const char *what);
 
 int generator_hook_up_mkswap(
         const char *dir,
@@ -96,6 +67,23 @@ int generator_hook_up_quotaon(
         const char *where,
         const char *target);
 
+int generator_write_cryptsetup_unit_section(FILE *f, const char *source);
+int generator_write_cryptsetup_service_section(
+                FILE *f,
+                const char *name,
+                const char *what,
+                const char *password,
+                const char *options);
+
+int generator_write_veritysetup_unit_section(FILE *f, const char *source);
+int generator_write_veritysetup_service_section(
+                FILE *f,
+                const char *name,
+                const char *data_what,
+                const char *hash_what,
+                const char *roothash,
+                const char *options);
+
 int generator_enable_remount_fs_service(const char *dir);
 
 void log_setup_generator(void);