chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v228: Add remaining updates from upstream (1/3)
[elogind.git]
/
src
/
basic
/
log.c
diff --git
a/src/basic/log.c
b/src/basic/log.c
index 5a702112f7c3af57a3b450e5dab12d5b90731e98..8f564a140cb5af8d213d6cfa2471eb550f3a5a79 100644
(file)
--- a/
src/basic/log.c
+++ b/
src/basic/log.c
@@
-27,8
+27,8
@@
#include <sys/socket.h>
#include <sys/un.h>
#include <stddef.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <stddef.h>
-#include <printf.h>
+#include "parse-printf-format.h"
#include "sd-messages.h"
#include "log.h"
#include "util.h"
#include "sd-messages.h"
#include "log.h"
#include "util.h"
@@
-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) {
@@
-446,7
+446,7
@@
static int write_to_syslog(
static int write_to_kmsg(
int level,
int error,
static int write_to_kmsg(
int level,
int error,
- const char*file,
+ const char
*file,
int line,
const char *func,
const char *object_field,
int line,
const char *func,
const char *object_field,
@@
-519,7
+519,7
@@
static int log_do_header(
static int write_to_journal(
int level,
int error,
static int write_to_journal(
int level,
int error,
- const char*file,
+ const char
*file,
int line,
const char *func,
const char *object_field,
int line,
const char *func,
const char *object_field,
@@
-657,7
+657,7
@@
int log_dump_internal(
int log_internalv(
int level,
int error,
int log_internalv(
int level,
int error,
- const char*file,
+ const char
*file,
int line,
const char *func,
const char *format,
int line,
const char *func,
const char *format,
@@
-684,7
+684,7
@@
int log_internalv(
int log_internal(
int level,
int error,
int log_internal(
int level,
int error,
- const char*file,
+ const char
*file,
int line,
const char *func,
const char *format, ...) {
int line,
const char *func,
const char *format, ...) {
@@
-702,7
+702,7
@@
int log_internal(
int log_object_internalv(
int level,
int error,
int log_object_internalv(
int level,
int error,
- const char*file,
+ const char
*file,
int line,
const char *func,
const char *object_field,
int line,
const char *func,
const char *object_field,
@@
-746,7
+746,7
@@
int log_object_internalv(
int log_object_internal(
int level,
int error,
int log_object_internal(
int level,
int error,
- const char*file,
+ const char
*file,
int line,
const char *func,
const char *object_field,
int line,
const char *func,
const char *object_field,
@@
-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;