chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
strv: add calls to add two entries to an strv at once
[elogind.git]
/
src
/
libsystemd-terminal
/
subterm.c
diff --git
a/src/libsystemd-terminal/subterm.c
b/src/libsystemd-terminal/subterm.c
index f2651b24ac3759a148a3d623ad7bc3b1b8c56f0d..75a25e5590e3ada98ee3e0ca23784fa6efe9e106 100644
(file)
--- a/
src/libsystemd-terminal/subterm.c
+++ b/
src/libsystemd-terminal/subterm.c
@@
-102,10
+102,8
@@
static int output_winch(Output *o) {
assert_return(o, -EINVAL);
r = ioctl(o->fd, TIOCGWINSZ, &wsz);
assert_return(o, -EINVAL);
r = ioctl(o->fd, TIOCGWINSZ, &wsz);
- if (r < 0) {
- log_error_errno(errno, "error: cannot read window-size: %m");
- return -errno;
- }
+ if (r < 0)
+ return log_error_errno(errno, "error: cannot read window-size: %m");
if (wsz.ws_col != o->width || wsz.ws_row != o->height) {
o->width = wsz.ws_col;
if (wsz.ws_col != o->width || wsz.ws_row != o->height) {
o->width = wsz.ws_col;
@@
-822,16
+820,12
@@
static int terminal_new(Terminal **out, int in_fd, int out_fd) {
assert_return(out, -EINVAL);
r = tcgetattr(in_fd, &in_attr);
assert_return(out, -EINVAL);
r = tcgetattr(in_fd, &in_attr);
- if (r < 0) {
- log_error_errno(errno, "error: tcgetattr() (%d): %m", -errno);
- return -errno;
- }
+ if (r < 0)
+ return log_error_errno(errno, "error: tcgetattr() (%d): %m", -errno);
r = tcgetattr(out_fd, &out_attr);
r = tcgetattr(out_fd, &out_attr);
- if (r < 0) {
- log_error_errno(errno, "error: tcgetattr() (%d): %m", -errno);
- return -errno;
- }
+ if (r < 0)
+ return log_error_errno(errno, "error: tcgetattr() (%d): %m", -errno);
t = new0(Terminal, 1);
if (!t)
t = new0(Terminal, 1);
if (!t)