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: use log_*_errno whenever %m is in the format string
[elogind.git]
/
src
/
libsystemd-terminal
/
modeset.c
diff --git
a/src/libsystemd-terminal/modeset.c
b/src/libsystemd-terminal/modeset.c
index 2f8860dd5f524b5e7e11d1b8216b19f3f07a9209..f7bcbb2914890102ed7501de6f9ef96a56d84cda 100644
(file)
--- a/
src/libsystemd-terminal/modeset.c
+++ b/
src/libsystemd-terminal/modeset.c
@@
-146,16
+146,12
@@
static int modeset_new(Modeset **out) {
return log_oom();
r = sd_pid_get_session(getpid(), &m->session);
return log_oom();
r = sd_pid_get_session(getpid(), &m->session);
- if (r < 0) {
- log_error("Cannot retrieve logind session: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Cannot retrieve logind session: %m");
r = sd_session_get_seat(m->session, &m->seat);
r = sd_session_get_seat(m->session, &m->seat);
- if (r < 0) {
- log_error("Cannot retrieve seat of logind session: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Cannot retrieve seat of logind session: %m");
m->my_tty = is_my_tty(m->session);
m->managed = m->my_tty && geteuid() > 0;
m->my_tty = is_my_tty(m->session);
m->managed = m->my_tty && geteuid() > 0;
@@
-258,7
+254,7
@@
static void modeset_render(Modeset *m, grdev_display *d) {
GRDEV_DISPLAY_FOREACH_TARGET(d, t) {
modeset_draw(m, t);
GRDEV_DISPLAY_FOREACH_TARGET(d, t) {
modeset_draw(m, t);
- grdev_display_flip_target(d, t
, 1
);
+ grdev_display_flip_target(d, t);
}
grdev_session_commit(m->grdev_session);
}
grdev_session_commit(m->grdev_session);
@@
-309,17
+305,13
@@
static int modeset_sysview_fn(sysview_context *c, void *userdata, sysview_event
name,
modeset_grdev_fn,
m);
name,
modeset_grdev_fn,
m);
- if (r < 0) {
- log_error("Cannot create grdev session: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Cannot create grdev session: %m");
if (m->managed) {
r = sysview_session_take_control(ev->session_add.session);
if (m->managed) {
r = sysview_session_take_control(ev->session_add.session);
- if (r < 0) {
- log_error("Cannot request session control: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Cannot request session control: %m");
}
grdev_session_enable(m->grdev_session);
}
grdev_session_enable(m->grdev_session);
@@
-358,14
+350,12
@@
static int modeset_sysview_fn(sysview_context *c, void *userdata, sysview_event
break;
case SYSVIEW_EVENT_SESSION_CONTROL:
r = ev->session_control.error;
break;
case SYSVIEW_EVENT_SESSION_CONTROL:
r = ev->session_control.error;
- if (r < 0) {
- log_error("Cannot acquire session control: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Cannot acquire session control: %m");
r = ioctl(1, KDSKBMODE, K_UNICODE);
if (r < 0) {
r = ioctl(1, KDSKBMODE, K_UNICODE);
if (r < 0) {
- log_error
(
"Cannot set K_UNICODE on stdout: %m");
+ log_error
_errno(errno,
"Cannot set K_UNICODE on stdout: %m");
return -errno;
}
return -errno;
}
@@
-480,7
+470,7
@@
int main(int argc, char *argv[]) {
log_parse_environment();
log_open();
log_parse_environment();
log_open();
-
srand(time(NULL)
);
+
initialize_srand(
);
r = parse_argv(argc, argv);
if (r <= 0)
r = parse_argv(argc, argv);
if (r <= 0)