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: no need to negate errno for log_*_errno()
[elogind.git]
/
src
/
shared
/
util.c
diff --git
a/src/shared/util.c
b/src/shared/util.c
index 11be757c2f5fe281a26ae7a55483a20f1351180b..646787cd79870f6f1fc991132bd89d6e7133ff5f 100644
(file)
--- a/
src/shared/util.c
+++ b/
src/shared/util.c
@@
-2214,7
+2214,7
@@
int acquire_terminal(
r = reset_terminal_fd(fd, true);
if (r < 0)
r = reset_terminal_fd(fd, true);
if (r < 0)
- log_warning_errno(
-
r, "Failed to reset terminal: %m");
+ log_warning_errno(r, "Failed to reset terminal: %m");
return fd;
return fd;
@@
-3796,7
+3796,7
@@
int wait_for_terminate_and_warn(const char *name, pid_t pid) {
r = wait_for_terminate(pid, &status);
if (r < 0) {
r = wait_for_terminate(pid, &status);
if (r < 0) {
- log_warning_errno(
-
r, "Failed to wait for %s: %m", name);
+ log_warning_errno(r, "Failed to wait for %s: %m", name);
return r;
}
return r;
}
@@
-5507,13
+5507,13
@@
int make_console_stdio(void) {
fd = acquire_terminal("/dev/console", false, true, true, USEC_INFINITY);
if (fd < 0) {
fd = acquire_terminal("/dev/console", false, true, true, USEC_INFINITY);
if (fd < 0) {
- log_error_errno(
-
fd, "Failed to acquire terminal: %m");
+ log_error_errno(fd, "Failed to acquire terminal: %m");
return fd;
}
r = make_stdio(fd);
if (r < 0) {
return fd;
}
r = make_stdio(fd);
if (r < 0) {
- log_error_errno(
-
r, "Failed to duplicate terminal fd: %m");
+ log_error_errno(r, "Failed to duplicate terminal fd: %m");
return r;
}
return r;
}