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 v232: Add libelogind.sym entries for version 232.
[elogind.git]
/
src
/
basic
/
log.c
diff --git
a/src/basic/log.c
b/src/basic/log.c
index 521ea92efd16c892d4c1f3352f28a87db35e175d..d84c9bf116b43c88d239079663e4e9f3ed235385 100644
(file)
--- a/
src/basic/log.c
+++ b/
src/basic/log.c
@@
-798,7
+798,7
@@
static void log_assert(
return;
DISABLE_WARNING_FORMAT_NONLITERAL;
return;
DISABLE_WARNING_FORMAT_NONLITERAL;
-
xsprintf(
buffer, format, text, file, line, func);
+
snprintf(buffer, sizeof
buffer, format, text, file, line, func);
REENABLE_WARNING;
log_abort_msg = buffer;
REENABLE_WARNING;
log_abort_msg = buffer;
@@
-985,7
+985,7
@@
int log_set_max_level_from_string(const char *e) {
return 0;
}
return 0;
}
-static int parse_proc_cmdline_item(const char *key, const char *value) {
+static int parse_proc_cmdline_item(const char *key, const char *value
, void *data
) {
/*
* The systemd.log_xyz= settings are parsed by all tools, and
/*
* The systemd.log_xyz= settings are parsed by all tools, and
@@
-1030,7
+1030,7
@@
void log_parse_environment(void) {
/* Only try to read the command line in daemons.
We assume that anything that has a controlling
tty is user stuff. */
/* Only try to read the command line in daemons.
We assume that anything that has a controlling
tty is user stuff. */
- (void) parse_proc_cmdline(parse_proc_cmdline_item);
+ (void) parse_proc_cmdline(parse_proc_cmdline_item
, NULL, true
);
e = secure_getenv("SYSTEMD_LOG_TARGET");
if (e && log_set_target_from_string(e) < 0)
e = secure_getenv("SYSTEMD_LOG_TARGET");
if (e && log_set_target_from_string(e) < 0)