chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: auto-convert the simple cases to log_*_errno()
[elogind.git]
/
src
/
login
/
logind-seat.c
diff --git
a/src/login/logind-seat.c
b/src/login/logind-seat.c
index 3f5efdc8ea706f8195b463163f838a5d4d34fd75..04909a991a5f1a0de020b09e863ffdc065582ec3 100644
(file)
--- a/
src/login/logind-seat.c
+++ b/
src/login/logind-seat.c
@@
-120,9
+120,9
@@
int seat_save(Seat *s) {
fprintf(f,
"ACTIVE=%s\n"
fprintf(f,
"ACTIVE=%s\n"
- "ACTIVE_UID=
%lu
\n",
+ "ACTIVE_UID=
"UID_FMT"
\n",
s->active->id,
s->active->id,
-
(unsigned long)
s->active->user->uid);
+ s->active->user->uid);
}
if (s->sessions) {
}
if (s->sessions) {
@@
-154,7
+154,7
@@
int seat_save(Seat *s) {
finish:
if (r < 0)
finish:
if (r < 0)
- log_error
("Failed to save seat data %s: %s", s->state_file, strerror(-r)
);
+ log_error
_errno(-r, "Failed to save seat data %s: %m", s->state_file
);
return r;
}
return r;
}
@@
-201,7
+201,7
@@
int seat_preallocate_vts(Seat *s) {
q = vt_allocate(i);
if (q < 0) {
q = vt_allocate(i);
if (q < 0) {
- log_error
("Failed to preallocate VT %i: %s", i, strerror(-q)
);
+ log_error
_errno(-q, "Failed to preallocate VT %i: %m", i
);
r = q;
}
}
r = q;
}
}
@@
-221,7
+221,7
@@
int seat_apply_acls(Seat *s, Session *old_active) {
!!s->active, s->active ? s->active->user->uid : 0);
if (r < 0)
!!s->active, s->active ? s->active->user->uid : 0);
if (r < 0)
- log_error
("Failed to apply ACLs: %s", strerror(-r)
);
+ log_error
_errno(-r, "Failed to apply ACLs: %m"
);
return r;
}
return r;
}
@@
-275,8
+275,13
@@
int seat_switch_to(Seat *s, unsigned int num) {
if (!num)
return -EINVAL;
if (!num)
return -EINVAL;
- if (num >= s->position_count || !s->positions[num])
+ if (num >= s->position_count || !s->positions[num]) {
+ /* allow switching to unused VTs to trigger auto-activate */
+ if (seat_has_vts(s) && num < 64)
+ return chvt(num);
+
return -EINVAL;
return -EINVAL;
+ }
return session_activate(s->positions[num]);
}
return session_activate(s->positions[num]);
}
@@
-395,9
+400,9
@@
int seat_start(Seat *s) {
return 0;
log_struct(LOG_INFO,
return 0;
log_struct(LOG_INFO,
- MESSAGE_ID(SD_MESSAGE_SEAT_START),
+
LOG_
MESSAGE_ID(SD_MESSAGE_SEAT_START),
"SEAT_ID=%s", s->id,
"SEAT_ID=%s", s->id,
-
"MESSAGE=New seat %s.", s->id
,
+
LOG_MESSAGE("New seat %s.", s->id)
,
NULL);
/* Initialize VT magic stuff */
NULL);
/* Initialize VT magic stuff */
@@
-423,9
+428,9
@@
int seat_stop(Seat *s, bool force) {
if (s->started)
log_struct(LOG_INFO,
if (s->started)
log_struct(LOG_INFO,
- MESSAGE_ID(SD_MESSAGE_SEAT_STOP),
+
LOG_
MESSAGE_ID(SD_MESSAGE_SEAT_STOP),
"SEAT_ID=%s", s->id,
"SEAT_ID=%s", s->id,
-
"MESSAGE=Removed seat %s.", s->id
,
+
LOG_MESSAGE("Removed seat %s.", s->id)
,
NULL);
seat_stop_sessions(s, force);
NULL);
seat_stop_sessions(s, force);
@@
-485,7
+490,7
@@
void seat_claim_position(Seat *s, Session *session, unsigned int pos) {
if (seat_has_vts(s))
pos = session->vtnr;
if (seat_has_vts(s))
pos = session->vtnr;
- if (!GREEDY_REALLOC0
_T
(s->positions, s->position_count, pos + 1))
+ if (!GREEDY_REALLOC0(s->positions, s->position_count, pos + 1))
return;
seat_evict_position(s, session);
return;
seat_evict_position(s, session);