shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-25 10:04:04 +03:00
Code

logind: simplify code

Browse Source 
Follow-up for 4885d7490b23e08d8444e5a68927ce9ce8727e5a.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2022-06-23 09:56:33 +02:00
parent 6cacdb3985
commit e5c09aad37
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/login/logind-session.c
View File

@ -359,12 +359,11 @@ fail:
}
static int session_load_devices(Session *s, const char *devices) {
const char *p;
int r = 0;
assert(s);
for (p = devices;;) {
for (const char *p = devices;;) {
_cleanup_free_ char *word = NULL;
SessionDevice *sd;
dev_t dev;
@ -551,7 +550,7 @@ int session_load(Session *s) {
s->class = c;
}
if (state && streq(state, "closing"))
if (streq_ptr(state, "closing"))
s->stopping = true;
if (s->fifo_path) {
@ -1050,11 +1049,8 @@ int session_set_display(Session *s, const char *display) {
assert(s);
assert(display);
if (streq(s->display, display))
return 0;
r = free_and_strdup(&s->display, display);
if (r < 0)
if (r <= 0) /* 0 means the strings were equal */
return r;
session_save(s);
@ -1333,9 +1329,7 @@ void session_leave_vt(Session *s) {
}
bool session_is_controller(Session *s, const char *sender) {
assert(s);
return streq_ptr(s->controller, sender);
return streq_ptr(ASSERT_PTR(s)->controller, sender);
}
static void session_release_controller(Session *s, bool notify) {