From b910cc72c0fb56d96bf98704450fba1f339d8527 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 11 Jul 2019 19:14:16 +0200 Subject: tree-wide: get rid of strappend() It's a special case of strjoin(), so no need to keep both. In particular as typing strjoin() is even shoert than strappend(). --- src/journal/journald-stream.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/journal/journald-stream.c') diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c index 24d4ac30b2..afebadeccc 100644 --- a/src/journal/journald-stream.c +++ b/src/journal/journald-stream.c @@ -294,7 +294,7 @@ static int stdout_stream_log(StdoutStream *s, const char *p, LineBreak line_brea } if (s->identifier) { - syslog_identifier = strappend("SYSLOG_IDENTIFIER=", s->identifier); + syslog_identifier = strjoin("SYSLOG_IDENTIFIER=", s->identifier); if (syslog_identifier) iovec[n++] = IOVEC_MAKE_STRING(syslog_identifier); } @@ -311,7 +311,7 @@ static int stdout_stream_log(StdoutStream *s, const char *p, LineBreak line_brea iovec[n++] = IOVEC_MAKE_STRING(c); } - message = strappend("MESSAGE=", p); + message = strjoin("MESSAGE=", p); if (message) iovec[n++] = IOVEC_MAKE_STRING(message); @@ -649,7 +649,7 @@ static int stdout_stream_load(StdoutStream *stream, const char *fname) { assert(fname); if (!stream->state_file) { - stream->state_file = strappend("/run/systemd/journal/streams/", fname); + stream->state_file = path_join("/run/systemd/journal/streams", fname); if (!stream->state_file) return log_oom(); } -- cgit v1.2.1