chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update TODO
[elogind.git]
/
src
/
vconsole
/
vconsole-setup.c
diff --git
a/src/vconsole/vconsole-setup.c
b/src/vconsole/vconsole-setup.c
index 25d15afd5c9e5d6bbcc8a5134424e3ac8feaec0a..b7a536b983a46ff3666323022d643efc40fc1866 100644
(file)
--- a/
src/vconsole/vconsole-setup.c
+++ b/
src/vconsole/vconsole-setup.c
@@
-62,7
+62,7
@@
static int disable_utf8(int fd) {
r = k;
if (r < 0)
r = k;
if (r < 0)
- log_warning
("Failed to disable UTF-8: %s", strerror(-r)
);
+ log_warning
_errno(r, "Failed to disable UTF-8: %m"
);
return r;
}
return r;
}
@@
-94,7
+94,7
@@
static int enable_utf8(int fd) {
r = k;
if (r < 0)
r = k;
if (r < 0)
- log_warning
("Failed to enable UTF-8: %s", strerror(-r)
);
+ log_warning
_errno(r, "Failed to enable UTF-8: %m"
);
return r;
}
return r;
}
@@
-122,10
+122,9
@@
static int keymap_load(const char *vc, const char *map, const char *map_toggle,
args[i++] = NULL;
pid = fork();
args[i++] = NULL;
pid = fork();
- if (pid < 0) {
- log_error("Failed to fork: %m");
- return -errno;
- } else if (pid == 0) {
+ if (pid < 0)
+ return log_error_errno(errno, "Failed to fork: %m");
+ else if (pid == 0) {
execv(args[0], (char **) args);
_exit(EXIT_FAILURE);
}
execv(args[0], (char **) args);
_exit(EXIT_FAILURE);
}
@@
-160,10
+159,9
@@
static int font_load(const char *vc, const char *font, const char *map, const ch
args[i++] = NULL;
pid = fork();
args[i++] = NULL;
pid = fork();
- if (pid < 0) {
- log_error("Failed to fork: %m");
- return -errno;
- } else if (pid == 0) {
+ if (pid < 0)
+ return log_error_errno(errno, "Failed to fork: %m");
+ else if (pid == 0) {
execv(args[0], (char **) args);
_exit(EXIT_FAILURE);
}
execv(args[0], (char **) args);
_exit(EXIT_FAILURE);
}
@@
-212,15
+210,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
+228,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);
}
}
}
}
}
}
@@
-262,7
+260,7
@@
int main(int argc, char **argv) {
fd = open_terminal(vc, O_RDWR|O_CLOEXEC);
if (fd < 0) {
fd = open_terminal(vc, O_RDWR|O_CLOEXEC);
if (fd < 0) {
- log_error
(
"Failed to open %s: %m", vc);
+ log_error
_errno(errno,
"Failed to open %s: %m", vc);
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-282,7
+280,7
@@
int main(int argc, char **argv) {
NULL);
if (r < 0 && r != -ENOENT)
NULL);
if (r < 0 && r != -ENOENT)
- log_warning
("Failed to read /etc/vconsole.conf: %s", strerror(-r)
);
+ log_warning
_errno(r, "Failed to read /etc/vconsole.conf: %m"
);
/* Let the kernel command line override /etc/vconsole.conf */
if (detect_container(NULL) <= 0) {
/* Let the kernel command line override /etc/vconsole.conf */
if (detect_container(NULL) <= 0) {
@@
-295,7
+293,7
@@
int main(int argc, char **argv) {
NULL);
if (r < 0 && r != -ENOENT)
NULL);
if (r < 0 && r != -ENOENT)
- log_warning
("Failed to read /proc/cmdline: %s", strerror(-r)
);
+ log_warning
_errno(r, "Failed to read /proc/cmdline: %m"
);
}
if (utf8)
}
if (utf8)
@@
-305,21
+303,21
@@
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
_errno(r, "Failed to start " KBD_SETFONT ": %m"
);
return EXIT_FAILURE;
}
if (font_pid > 0)
return EXIT_FAILURE;
}
if (font_pid > 0)
- wait_for_terminate_and_warn(KBD_SETFONT, font_pid);
+ wait_for_terminate_and_warn(KBD_SETFONT, font_pid
, true
);
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
_errno(r, "Failed to start " KBD_LOADKEYS ": %m"
);
return EXIT_FAILURE;
}
if (keymap_pid > 0)
return EXIT_FAILURE;
}
if (keymap_pid > 0)
- wait_for_terminate_and_warn(KBD_LOADKEYS, keymap_pid);
+ wait_for_terminate_and_warn(KBD_LOADKEYS, keymap_pid
, true
);
/* Only copy the font when we started setfont successfully */
if (font_copy && font_pid > 0)
/* Only copy the font when we started setfont successfully */
if (font_copy && font_pid > 0)