chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[2/5] Apply missing fixes from upstream
[elogind.git]
/
src
/
basic
/
log.c
diff --git
a/src/basic/log.c
b/src/basic/log.c
index 921c952f833dff4c76e7f8ff0cea554021171065..c6f70a1878f0f139a8423b8e01428265142ad405 100644
(file)
--- a/
src/basic/log.c
+++ b/
src/basic/log.c
@@
-351,10
+351,10
@@
static int write_to_console(
}
if (highlight)
}
if (highlight)
- IOVEC_SET_STRING(iovec[n++], ANSI_HIGHLIGHT_RED
_ON
);
+ IOVEC_SET_STRING(iovec[n++], ANSI_HIGHLIGHT_RED);
IOVEC_SET_STRING(iovec[n++], buffer);
if (highlight)
IOVEC_SET_STRING(iovec[n++], buffer);
if (highlight)
- IOVEC_SET_STRING(iovec[n++], ANSI_
HIGHLIGHT_OFF
);
+ IOVEC_SET_STRING(iovec[n++], ANSI_
NORMAL
);
IOVEC_SET_STRING(iovec[n++], "\n");
if (writev(console_fd, iovec, n) < 0) {
IOVEC_SET_STRING(iovec[n++], "\n");
if (writev(console_fd, iovec, n) < 0) {
@@
-942,7
+942,7
@@
int log_set_max_level_from_string(const char *e) {
t = log_level_from_string(e);
if (t < 0)
t = log_level_from_string(e);
if (t < 0)
- return
t
;
+ return
-EINVAL
;
log_set_max_level(t);
return 0;
log_set_max_level(t);
return 0;