diff options
author | Daniel Mack <github@zonque.org> | 2015-11-09 21:56:49 +0100 |
---|---|---|
committer | Daniel Mack <github@zonque.org> | 2015-11-09 21:56:49 +0100 |
commit | b0bc8dbd73b7d1f66f01849d89acca59c9fbc699 (patch) | |
tree | cf4ce91cd4a2c4dcf325ee210aa507b4dc5e78bb /src/journal/journalctl.c | |
parent | 70d54fca18f52e20c07f37a6c86133229521ee47 (diff) | |
parent | e1427b138fbf7b7f13bb61187635b882be3ca2b2 (diff) |
Merge pull request #1820 from michich/errno-v2
[v2] treewide: treatment of errno and other cleanups
Diffstat (limited to 'src/journal/journalctl.c')
-rw-r--r-- | src/journal/journalctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 98a852cb50..277adba904 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -1483,7 +1483,7 @@ static int setup_keys(void) { safe_close(fd); fd = mkostemp_safe(k, O_WRONLY|O_CLOEXEC); if (fd < 0) { - r = log_error_errno(errno, "Failed to open %s: %m", k); + r = log_error_errno(fd, "Failed to open %s: %m", k); goto finish; } @@ -1491,7 +1491,7 @@ static int setup_keys(void) { * writing and in-place updating */ r = chattr_fd(fd, FS_SECRM_FL|FS_NODUMP_FL|FS_SYNC_FL|FS_NOCOW_FL, FS_SECRM_FL|FS_NODUMP_FL|FS_SYNC_FL|FS_NOCOW_FL); if (r < 0) - log_warning_errno(errno, "Failed to set file attributes: %m"); + log_warning_errno(r, "Failed to set file attributes: %m"); zero(h); memcpy(h.signature, "KSHHRHLP", 8); |