diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-07-15 13:02:27 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-07-15 13:03:46 +0200 |
| commit | f843f85da8814c42117ac8fdffb613a3a2f02cbf (patch) | |
| tree | 4cf3db0113aa707680aa8a3dfc53e802d7cbb440 /src/journal | |
| parent | network: slightly simplify log_address_debug() (diff) | |
| download | systemd-f843f85da8814c42117ac8fdffb613a3a2f02cbf.tar.xz systemd-f843f85da8814c42117ac8fdffb613a3a2f02cbf.zip | |
tree-wide: FORMAT_TIMESTAMP() or friends must be used as a function argument
Follow-ups for #20109.
Diffstat (limited to 'src/journal')
| -rw-r--r-- | src/journal/journald-server.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 7770df41f1..d410d7cf19 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -209,19 +209,17 @@ void server_space_usage_message(Server *s, JournalStorage *storage) { const JournalMetrics *metrics = &storage->metrics; - const char - *vfs_used = FORMAT_BYTES(storage->space.vfs_used), - *limit = FORMAT_BYTES(storage->space.limit), - *available = FORMAT_BYTES(storage->space.available); - server_driver_message(s, 0, "MESSAGE_ID=" SD_MESSAGE_JOURNAL_USAGE_STR, LOG_MESSAGE("%s (%s) is %s, max %s, %s free.", - storage->name, storage->path, vfs_used, limit, available), + storage->name, storage->path, + FORMAT_BYTES(storage->space.vfs_used), + FORMAT_BYTES(storage->space.limit), + FORMAT_BYTES(storage->space.available)), "JOURNAL_NAME=%s", storage->name, "JOURNAL_PATH=%s", storage->path, "CURRENT_USE=%"PRIu64, storage->space.vfs_used, - "CURRENT_USE_PRETTY=%s", vfs_used, + "CURRENT_USE_PRETTY=%s", FORMAT_BYTES(storage->space.vfs_used), "MAX_USE=%"PRIu64, metrics->max_use, "MAX_USE_PRETTY=%s", FORMAT_BYTES(metrics->max_use), "DISK_KEEP_FREE=%"PRIu64, metrics->keep_free, @@ -229,9 +227,9 @@ void server_space_usage_message(Server *s, JournalStorage *storage) { "DISK_AVAILABLE=%"PRIu64, storage->space.vfs_available, "DISK_AVAILABLE_PRETTY=%s", FORMAT_BYTES(storage->space.vfs_available), "LIMIT=%"PRIu64, storage->space.limit, - "LIMIT_PRETTY=%s", limit, + "LIMIT_PRETTY=%s", FORMAT_BYTES(storage->space.limit), "AVAILABLE=%"PRIu64, storage->space.available, - "AVAILABLE_PRETTY=%s", available, + "AVAILABLE_PRETTY=%s", FORMAT_BYTES(storage->space.available), NULL); } |