Skip to content

Commit e7ac08e

Browse files
committed
shutdown: merge variable declaration lines a bit
1 parent 9a75c65 commit e7ac08e

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

src/shutdown/shutdown.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,13 +295,11 @@ static void bump_sysctl_printk_log_level(int min_level) {
295295
}
296296

297297
int main(int argc, char *argv[]) {
298-
bool need_umount, need_swapoff, need_loop_detach, need_dm_detach;
299-
bool in_container, use_watchdog = false, can_initrd;
298+
bool need_umount, need_swapoff, need_loop_detach, need_dm_detach, in_container, use_watchdog = false, can_initrd;
300299
_cleanup_free_ char *cgroup = NULL;
301-
char *arguments[3];
300+
char *arguments[3], *watchdog_device;
302301
int cmd, r, umount_log_level = LOG_INFO;
303302
static const char* const dirs[] = {SYSTEM_SHUTDOWN_PATH, NULL};
304-
char *watchdog_device;
305303

306304
/* The log target defaults to console, but the original systemd process will pass its log target in through a
307305
* command line argument, which will override this default. Also, ensure we'll never log to the journal or

0 commit comments

Comments
 (0)