diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-06-04 12:59:22 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2018-06-04 13:46:03 +0200 |
commit | a1230ff972a6a5d945749e5280cd092a2aa827dd (patch) | |
tree | f6e7280a3e2162132c1b2df8cfc530105b8e431d /src/login | |
parent | 4055a62faffc1ad6318265a674b3eb026ebdf78b (diff) | |
download | systemd-a1230ff972a6a5d945749e5280cd092a2aa827dd.tar.gz |
basic/log: add the log_struct terminator to macro
This way all callers do not need to specify it.
Exhaustively tested by running test-log under valgrind ;)
Diffstat (limited to 'src/login')
-rw-r--r-- | src/login/logind-button.c | 21 | ||||
-rw-r--r-- | src/login/logind-dbus.c | 3 | ||||
-rw-r--r-- | src/login/logind-seat.c | 6 | ||||
-rw-r--r-- | src/login/logind-session.c | 6 |
4 files changed, 12 insertions, 24 deletions
diff --git a/src/login/logind-button.c b/src/login/logind-button.c index 4937d55bb6..39749925c5 100644 --- a/src/login/logind-button.c +++ b/src/login/logind-button.c @@ -159,8 +159,7 @@ static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u case KEY_POWER2: log_struct(LOG_INFO, LOG_MESSAGE("Power key pressed."), - "MESSAGE_ID=" SD_MESSAGE_POWER_KEY_STR, - NULL); + "MESSAGE_ID=" SD_MESSAGE_POWER_KEY_STR); manager_handle_action(b->manager, INHIBIT_HANDLE_POWER_KEY, b->manager->handle_power_key, b->manager->power_key_ignore_inhibited, true); break; @@ -174,8 +173,7 @@ static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u case KEY_SLEEP: log_struct(LOG_INFO, LOG_MESSAGE("Suspend key pressed."), - "MESSAGE_ID=" SD_MESSAGE_SUSPEND_KEY_STR, - NULL); + "MESSAGE_ID=" SD_MESSAGE_SUSPEND_KEY_STR); manager_handle_action(b->manager, INHIBIT_HANDLE_SUSPEND_KEY, b->manager->handle_suspend_key, b->manager->suspend_key_ignore_inhibited, true); break; @@ -183,8 +181,7 @@ static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u case KEY_SUSPEND: log_struct(LOG_INFO, LOG_MESSAGE("Hibernate key pressed."), - "MESSAGE_ID=" SD_MESSAGE_HIBERNATE_KEY_STR, - NULL); + "MESSAGE_ID=" SD_MESSAGE_HIBERNATE_KEY_STR); manager_handle_action(b->manager, INHIBIT_HANDLE_HIBERNATE_KEY, b->manager->handle_hibernate_key, b->manager->hibernate_key_ignore_inhibited, true); break; @@ -195,8 +192,7 @@ static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u if (ev.code == SW_LID) { log_struct(LOG_INFO, LOG_MESSAGE("Lid closed."), - "MESSAGE_ID=" SD_MESSAGE_LID_CLOSED_STR, - NULL); + "MESSAGE_ID=" SD_MESSAGE_LID_CLOSED_STR); b->lid_closed = true; button_lid_switch_handle_action(b->manager, true); @@ -205,8 +201,7 @@ static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u } else if (ev.code == SW_DOCK) { log_struct(LOG_INFO, LOG_MESSAGE("System docked."), - "MESSAGE_ID=" SD_MESSAGE_SYSTEM_DOCKED_STR, - NULL); + "MESSAGE_ID=" SD_MESSAGE_SYSTEM_DOCKED_STR); b->docked = true; } @@ -216,8 +211,7 @@ static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u if (ev.code == SW_LID) { log_struct(LOG_INFO, LOG_MESSAGE("Lid opened."), - "MESSAGE_ID=" SD_MESSAGE_LID_OPENED_STR, - NULL); + "MESSAGE_ID=" SD_MESSAGE_LID_OPENED_STR); b->lid_closed = false; b->check_event_source = sd_event_source_unref(b->check_event_source); @@ -225,8 +219,7 @@ static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u } else if (ev.code == SW_DOCK) { log_struct(LOG_INFO, LOG_MESSAGE("System undocked."), - "MESSAGE_ID=" SD_MESSAGE_SYSTEM_UNDOCKED_STR, - NULL); + "MESSAGE_ID=" SD_MESSAGE_SYSTEM_UNDOCKED_STR); b->docked = false; } diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 7d7db0d823..3fe38c0527 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -1421,8 +1421,7 @@ static int bus_manager_log_shutdown( return log_struct(LOG_NOTICE, "MESSAGE_ID=" SD_MESSAGE_SHUTDOWN_STR, p, - q, - NULL); + q); } static int lid_switch_ignore_handler(sd_event_source *e, uint64_t usec, void *userdata) { diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c index 5d6c3da285..f8d825ffab 100644 --- a/src/login/logind-seat.c +++ b/src/login/logind-seat.c @@ -407,8 +407,7 @@ int seat_start(Seat *s) { log_struct(LOG_INFO, "MESSAGE_ID=" SD_MESSAGE_SEAT_START_STR, "SEAT_ID=%s", s->id, - LOG_MESSAGE("New seat %s.", s->id), - NULL); + LOG_MESSAGE("New seat %s.", s->id)); /* Initialize VT magic stuff */ seat_preallocate_vts(s); @@ -435,8 +434,7 @@ int seat_stop(Seat *s, bool force) { log_struct(LOG_INFO, "MESSAGE_ID=" SD_MESSAGE_SEAT_STOP_STR, "SEAT_ID=%s", s->id, - LOG_MESSAGE("Removed seat %s.", s->id), - NULL); + LOG_MESSAGE("Removed seat %s.", s->id)); seat_stop_sessions(s, force); diff --git a/src/login/logind-session.c b/src/login/logind-session.c index 4fb9491bb4..5a31a8fe07 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -615,8 +615,7 @@ int session_start(Session *s, sd_bus_message *properties) { "SESSION_ID=%s", s->id, "USER_ID=%s", s->user->name, "LEADER="PID_FMT, s->leader, - LOG_MESSAGE("New session %s of user %s.", s->id, s->user->name), - NULL); + LOG_MESSAGE("New session %s of user %s.", s->id, s->user->name)); if (!dual_timestamp_is_set(&s->timestamp)) dual_timestamp_get(&s->timestamp); @@ -731,8 +730,7 @@ int session_finalize(Session *s) { "SESSION_ID=%s", s->id, "USER_ID=%s", s->user->name, "LEADER="PID_FMT, s->leader, - LOG_MESSAGE("Removed session %s.", s->id), - NULL); + LOG_MESSAGE("Removed session %s.", s->id)); s->timer_event_source = sd_event_source_unref(s->timer_event_source); |