chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: check return value of vasprintf
[elogind.git]
/
src
/
vconsole
/
vconsole-setup.c
diff --git
a/src/vconsole/vconsole-setup.c
b/src/vconsole/vconsole-setup.c
index 25d15afd5c9e5d6bbcc8a5134424e3ac8feaec0a..0db97f88bc159919544d5927317699593edb4060 100644
(file)
--- a/
src/vconsole/vconsole-setup.c
+++ b/
src/vconsole/vconsole-setup.c
@@
-212,15
+212,15
@@
static void font_copy_to_all_vcs(int fd) {
/* copy font from active VT, where the font was uploaded to */
cfo.op = KD_FONT_OP_COPY;
cfo.height = vcs.v_active-1; /* tty1 == index 0 */
/* copy font from active VT, where the font was uploaded to */
cfo.op = KD_FONT_OP_COPY;
cfo.height = vcs.v_active-1; /* tty1 == index 0 */
- ioctl(vcfd, KDFONTOP, &cfo);
+
(void)
ioctl(vcfd, KDFONTOP, &cfo);
/* copy map of 8bit chars */
if (ioctl(fd, GIO_SCRNMAP, map8) >= 0)
/* copy map of 8bit chars */
if (ioctl(fd, GIO_SCRNMAP, map8) >= 0)
- ioctl(vcfd, PIO_SCRNMAP, map8);
+
(void)
ioctl(vcfd, PIO_SCRNMAP, map8);
/* copy map of 8bit chars -> 16bit Unicode values */
if (ioctl(fd, GIO_UNISCRNMAP, map16) >= 0)
/* copy map of 8bit chars -> 16bit Unicode values */
if (ioctl(fd, GIO_UNISCRNMAP, map16) >= 0)
- ioctl(vcfd, PIO_UNISCRNMAP, map16);
+
(void)
ioctl(vcfd, PIO_UNISCRNMAP, map16);
/* copy unicode translation table */
/* unimapd is a ushort count and a pointer to an
/* copy unicode translation table */
/* unimapd is a ushort count and a pointer to an
@@
-230,8
+230,8
@@
static void font_copy_to_all_vcs(int fd) {
if (ioctl(fd, GIO_UNIMAP, &unimapd) >= 0) {
struct unimapinit adv = { 0, 0, 0 };
if (ioctl(fd, GIO_UNIMAP, &unimapd) >= 0) {
struct unimapinit adv = { 0, 0, 0 };
- ioctl(vcfd, PIO_UNIMAPCLR, &adv);
- ioctl(vcfd, PIO_UNIMAP, &unimapd);
+
(void)
ioctl(vcfd, PIO_UNIMAPCLR, &adv);
+
(void)
ioctl(vcfd, PIO_UNIMAP, &unimapd);
}
}
}
}
}
}
@@
-305,7
+305,7
@@
int main(int argc, char **argv) {
r = font_load(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid);
if (r < 0) {
r = font_load(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid);
if (r < 0) {
- log_error("Failed to start " KBD_
LOADKEYS
": %s", strerror(-r));
+ log_error("Failed to start " KBD_
SETFONT
": %s", strerror(-r));
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-314,7
+314,7
@@
int main(int argc, char **argv) {
r = keymap_load(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid);
if (r < 0) {
r = keymap_load(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid);
if (r < 0) {
- log_error("Failed to start " KBD_
SETFONT
": %s", strerror(-r));
+ log_error("Failed to start " KBD_
LOADKEYS
": %s", strerror(-r));
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}