chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
autogen.sh: diet and sync with udev and kmod
[elogind.git]
/
src
/
log.c
diff --git
a/src/log.c
b/src/log.c
index 4f57821da3a97ca91efe17302be7c9fbb4333a63..3dfe65432b2b5288f0723c75faabc7be50ce51fe 100644
(file)
--- a/
src/log.c
+++ b/
src/log.c
@@
-95,7
+95,8
@@
static int log_open_kmsg(void) {
if (kmsg_fd >= 0)
return 0;
if (kmsg_fd >= 0)
return 0;
- if ((kmsg_fd = open("/dev/kmsg", O_WRONLY|O_NOCTTY|O_CLOEXEC)) < 0) {
+ kmsg_fd = open("/dev/kmsg", O_WRONLY|O_NOCTTY|O_CLOEXEC);
+ if (kmsg_fd < 0) {
log_error("Failed to open /dev/kmsg for logging: %s", strerror(errno));
return -errno;
}
log_error("Failed to open /dev/kmsg for logging: %s", strerror(errno));
return -errno;
}
@@
-265,14
+266,16
@@
static int write_to_console(
if (console_fd < 0)
return 0;
if (console_fd < 0)
return 0;
- snprintf(location, sizeof(location), "(%s:%u) ", file, line);
- char_array_0(location);
-
highlight = LOG_PRI(level) <= LOG_ERR && show_color;
zero(iovec);
highlight = LOG_PRI(level) <= LOG_ERR && show_color;
zero(iovec);
- if (show_location)
+
+ if (show_location) {
+ snprintf(location, sizeof(location), "(%s:%u) ", file, line);
+ char_array_0(location);
IOVEC_SET_STRING(iovec[n++], location);
IOVEC_SET_STRING(iovec[n++], location);
+ }
+
if (highlight)
IOVEC_SET_STRING(iovec[n++], ANSI_HIGHLIGHT_ON);
IOVEC_SET_STRING(iovec[n++], buffer);
if (highlight)
IOVEC_SET_STRING(iovec[n++], ANSI_HIGHLIGHT_ON);
IOVEC_SET_STRING(iovec[n++], buffer);