chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
importd: add new bus calls for importing local tar and raw images
[elogind.git]
/
src
/
libsystemd-terminal
/
modeset.c
diff --git
a/src/libsystemd-terminal/modeset.c
b/src/libsystemd-terminal/modeset.c
index f7bcbb2914890102ed7501de6f9ef96a56d84cda..cccaabaa0622037de627e1795861872c5abb2271 100644
(file)
--- a/
src/libsystemd-terminal/modeset.c
+++ b/
src/libsystemd-terminal/modeset.c
@@
-30,11
+30,9
@@
#include <errno.h>
#include <getopt.h>
#include <linux/kd.h>
#include <errno.h>
#include <getopt.h>
#include <linux/kd.h>
-#include <linux/vt.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <systemd/sd-bus.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <systemd/sd-bus.h>
@@
-43,10
+41,7
@@
#include <termios.h>
#include <unistd.h>
#include "build.h"
#include <termios.h>
#include <unistd.h>
#include "build.h"
-#include "bus-util.h"
-#include "event-util.h"
#include "grdev.h"
#include "grdev.h"
-#include "grdev-internal.h"
#include "macro.h"
#include "sysview.h"
#include "util.h"
#include "macro.h"
#include "sysview.h"
#include "util.h"
@@
-354,10
+349,8
@@
static int modeset_sysview_fn(sysview_context *c, void *userdata, sysview_event
return log_error_errno(r, "Cannot acquire session control: %m");
r = ioctl(1, KDSKBMODE, K_UNICODE);
return log_error_errno(r, "Cannot acquire session control: %m");
r = ioctl(1, KDSKBMODE, K_UNICODE);
- if (r < 0) {
- log_error_errno(errno, "Cannot set K_UNICODE on stdout: %m");
- return -errno;
- }
+ if (r < 0)
+ return log_error_errno(errno, "Cannot set K_UNICODE on stdout: %m");
break;
}
break;
}