From 5354b0b7c039b34e173ff5ddab01e6152bbf023a Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 24 Nov 2017 10:48:21 +0900 Subject: [PATCH 1/3] journald: add _printf_ attribute to server_driver_message() --- src/journal/journald-server.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h index 1f274ecf26..5de44d76b4 100644 --- a/src/journal/journald-server.h +++ b/src/journal/journald-server.h @@ -189,7 +189,7 @@ struct Server { #define N_IOVEC_PAYLOAD_FIELDS 15 void server_dispatch_message(Server *s, struct iovec *iovec, size_t n, size_t m, ClientContext *c, const struct timeval *tv, int priority, pid_t object_pid); -void server_driver_message(Server *s, pid_t object_pid, const char *message_id, const char *format, ...) _sentinel_; +void server_driver_message(Server *s, pid_t object_pid, const char *message_id, const char *format, ...) _sentinel_ _printf_(4,0); /* gperf lookup function */ const struct ConfigPerfItem* journald_gperf_lookup(const char *key, GPERF_LEN_TYPE length); From 4540ae7400d54c01ae858a309db5dedb13b7584a Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 24 Nov 2017 10:48:58 +0900 Subject: [PATCH 2/3] machine: remove unused variables --- src/machine/image-dbus.c | 1 - src/machine/machinectl.c | 1 - 2 files changed, 2 deletions(-) diff --git a/src/machine/image-dbus.c b/src/machine/image-dbus.c index 3d2fdd496c..aebfc38863 100644 --- a/src/machine/image-dbus.c +++ b/src/machine/image-dbus.c @@ -295,7 +295,6 @@ int bus_image_method_get_hostname( void *userdata, sd_bus_error *error) { - _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL; Image *image = userdata; int r; diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index a8eab2825c..b7285e419d 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -957,7 +957,6 @@ static int print_image_machine_id(sd_bus *bus, const char *name) { static int print_image_machine_info(sd_bus *bus, const char *name) { _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL; - _cleanup_strv_free_ char **l = NULL; int r; r = sd_bus_call_method( From a7353b4d1450accd189e848a5355693f026542f1 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 25 Nov 2017 19:11:57 +0900 Subject: [PATCH 3/3] firstboot: do not write vconsole.conf when arg_keymap is empty --- src/firstboot/firstboot.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c index afbfa3743d..207ddeb70f 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -346,13 +346,15 @@ static int process_keymap(void) { if (r < 0) return r; - if (!isempty(arg_keymap)) - keymap = STRV_MAKE(strjoina("KEYMAP=", arg_keymap)); - - if (!keymap) + if (isempty(arg_keymap)) return 0; - mkdir_parents(etc_vconsoleconf, 0755); + keymap = STRV_MAKE(strjoina("KEYMAP=", arg_keymap)); + + r = mkdir_parents(etc_vconsoleconf, 0755); + if (r < 0) + return log_error_errno(r, "Failed to create the parent directory of %s: %m", etc_vconsoleconf); + r = write_env_file(etc_vconsoleconf, keymap); if (r < 0) return log_error_errno(r, "Failed to write %s: %m", etc_vconsoleconf);