]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
shutdown: merge variable declaration lines a bit
authorLennart Poettering <lennart@poettering.net>
Fri, 12 Jul 2019 08:42:31 +0000 (10:42 +0200)
committerLennart Poettering <lennart@poettering.net>
Sat, 13 Jul 2019 09:05:07 +0000 (11:05 +0200)
src/shutdown/shutdown.c

index 45f346154772853f8fed98045b880c8e3466c958..a574a0704190bb845836feb144695b6e1666a25f 100644 (file)
@@ -295,13 +295,11 @@ static void bump_sysctl_printk_log_level(int min_level) {
 }
 
 int main(int argc, char *argv[]) {
-        bool need_umount, need_swapoff, need_loop_detach, need_dm_detach;
-        bool in_container, use_watchdog = false, can_initrd;
+        bool need_umount, need_swapoff, need_loop_detach, need_dm_detach, in_container, use_watchdog = false, can_initrd;
         _cleanup_free_ char *cgroup = NULL;
-        char *arguments[3];
+        char *arguments[3], *watchdog_device;
         int cmd, r, umount_log_level = LOG_INFO;
         static const char* const dirs[] = {SYSTEM_SHUTDOWN_PATH, NULL};
-        char *watchdog_device;
 
         /* The log target defaults to console, but the original systemd process will pass its log target in through a
          * command line argument, which will override this default. Also, ensure we'll never log to the journal or