clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-10-04 15:58:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

journal: prefer stack allocation

Browse Source
This commit is contained in:
Lennart Poettering
2015-10-02 22:37:53 +02:00
parent 804ae586d4
commit 84267e4043
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/journal/journald-server.c
+2 -8
View File
@@ -926,7 +926,7 @@ finish:
static int system_journal_open(Server *s, bool flush_requested) {
int r;
char *fn;
const char *fn;
sd_id128_t machine;
char ids[33];
@@ -969,9 +969,7 @@ static int system_journal_open(Server *s, bool flush_requested) {
if (!s->runtime_journal &&
(s->storage != STORAGE_NONE)) {
fn = strjoin("/run/log/journal/", ids, "/system.journal", NULL);
if (!fn)
return -ENOMEM;
fn = strjoina("/run/log/journal/", ids, "/system.journal", NULL);
if (s->system_journal) {
@@ -980,8 +978,6 @@ static int system_journal_open(Server *s, bool flush_requested) {
* it into the system journal */
r = journal_file_open(fn, O_RDWR, 0640, s->compress, false, &s->runtime_metrics, s->mmap, NULL, &s->runtime_journal);
free(fn);
if (r < 0) {
if (r != -ENOENT)
log_warning_errno(r, "Failed to open runtime journal: %m");
@@ -999,8 +995,6 @@ static int system_journal_open(Server *s, bool flush_requested) {
(void) mkdir_parents(fn, 0750);
r = journal_file_open_reliably(fn, O_RDWR|O_CREAT, 0640, s->compress, false, &s->runtime_metrics, s->mmap, NULL, &s->runtime_journal);
free(fn);
if (r < 0)
return log_error_errno(r, "Failed to open runtime journal: %m");
}