diff options
author | Lennart Poettering <lennart@poettering.net> | 2012-01-05 03:25:10 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2012-01-05 14:55:35 +0100 |
commit | 674f8283698517047a7c0e78cff1e18932a97b05 (patch) | |
tree | 0f90b187dfc69270d5e8b2c1759916d470ef3062 | |
parent | 81beb7508e72b29ae7cec60b50231cbe0c1d582e (diff) |
log: minor optimization
-rw-r--r-- | src/log.c | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -95,7 +95,8 @@ static int log_open_kmsg(void) { 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; } @@ -265,14 +266,16 @@ static int write_to_console( 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); - if (show_location) + + if (show_location) { + snprintf(location, sizeof(location), "(%s:%u) ", file, line); + char_array_0(location); IOVEC_SET_STRING(iovec[n++], location); + } + if (highlight) IOVEC_SET_STRING(iovec[n++], ANSI_HIGHLIGHT_ON); IOVEC_SET_STRING(iovec[n++], buffer); |