From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 22 Jun 2018 09:43:13 +0000 (+0200)
Subject: bootctl: tiny shortification
X-Git-Tag: v240~610^2~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a36b411ea27441fd8d3cb1905058d017615a7933;p=thirdparty%2Fsystemd.git

bootctl: tiny shortification
---

diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index 0ee908e8a34..04ba8f7170b 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -224,9 +224,8 @@ static int print_efi_option(uint16_t id, bool in_order) {
 }
 
 static int status_variables(void) {
-        int n_options, n_order;
         _cleanup_free_ uint16_t *options = NULL, *order = NULL;
-        int i;
+        int n_options, n_order, i;
 
         n_options = efi_get_boot_options(&options);
         if (n_options == -ENOENT)
@@ -806,9 +805,9 @@ static int install_loader_config(const char *esp_path) {
                 return log_oom();
         }
 
-        fprintf(f, "#timeout 3\n");
-        fprintf(f, "#console-mode keep\n");
-        fprintf(f, "default %s-*\n", sd_id128_to_string(machine_id, machine_string));
+        fprintf(f, "#timeout 3\n"
+                   "#console-mode keep\n"
+                   "default %s-*\n", sd_id128_to_string(machine_id, machine_string));
 
         r = fflush_sync_and_check(f);
         if (r < 0)
@@ -867,7 +866,7 @@ static int parse_argv(int argc, char *argv[]) {
                 { "path",         required_argument, NULL, ARG_PATH         },
                 { "print-path",   no_argument,       NULL, 'p'              },
                 { "no-variables", no_argument,       NULL, ARG_NO_VARIABLES },
-                { NULL,           0,                 NULL, 0                }
+                {}
         };
 
         int c, r;