shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 17:51:22 +03:00
Code

Merge pull request #7449 from yuwata/clang-warnings

Browse Source 
Several cleanups
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-11-25 15:38:08 +01:00 committed by GitHub
commit a0a7ba6598
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/firstboot/firstboot.c
View File

@ -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);

2
src/journal/journald-server.h
View File

@ -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);

1
src/machine/image-dbus.c
View File

@ -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;

1
src/machine/machinectl.c
View File

@ -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(