From 5a271b08b39e1c7d99037d0c595f644df9db8d76 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 27 May 2018 11:08:44 +0200 Subject: [PATCH] journal: remove unused args from journal_file_copy_entry() --- src/journal/journal-file.c | 2 +- src/journal/journal-file.h | 2 +- src/journal/journald-server.c | 4 ++-- src/journal/test-journal-flush.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c index 8fe4499..62ef40f 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -3575,7 +3575,7 @@ int journal_file_open_reliably( deferred_closes, template, ret); } -int journal_file_copy_entry(JournalFile *from, JournalFile *to, Object *o, uint64_t p, uint64_t *seqnum, Object **ret, uint64_t *offset) { +int journal_file_copy_entry(JournalFile *from, JournalFile *to, Object *o, uint64_t p) { uint64_t i, n; uint64_t q, xor_hash = 0; int r; diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h index 6411f85..869d043 100644 --- a/src/journal/journal-file.h +++ b/src/journal/journal-file.h @@ -229,7 +229,7 @@ int journal_file_move_to_entry_by_seqnum_for_data(JournalFile *f, uint64_t data_ int journal_file_move_to_entry_by_realtime_for_data(JournalFile *f, uint64_t data_offset, uint64_t realtime, direction_t direction, Object **ret, uint64_t *offset); int journal_file_move_to_entry_by_monotonic_for_data(JournalFile *f, uint64_t data_offset, sd_id128_t boot_id, uint64_t monotonic, direction_t direction, Object **ret, uint64_t *offset); -int journal_file_copy_entry(JournalFile *from, JournalFile *to, Object *o, uint64_t p, uint64_t *seqnum, Object **ret, uint64_t *offset); +int journal_file_copy_entry(JournalFile *from, JournalFile *to, Object *o, uint64_t p); void journal_file_dump(JournalFile *f); void journal_file_print_header(JournalFile *f); diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 554cf20..40fbdcd 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1012,7 +1012,7 @@ int server_flush_to_var(Server *s, bool require_flag_file) { goto finish; } - r = journal_file_copy_entry(f, s->system_journal, o, f->current_offset, NULL, NULL, NULL); + r = journal_file_copy_entry(f, s->system_journal, o, f->current_offset); if (r >= 0) continue; @@ -1031,7 +1031,7 @@ int server_flush_to_var(Server *s, bool require_flag_file) { } log_debug("Retrying write."); - r = journal_file_copy_entry(f, s->system_journal, o, f->current_offset, NULL, NULL, NULL); + r = journal_file_copy_entry(f, s->system_journal, o, f->current_offset); if (r < 0) { log_error_errno(r, "Can't write entry: %m"); goto finish; diff --git a/src/journal/test-journal-flush.c b/src/journal/test-journal-flush.c index cce547e..43925cf 100644 --- a/src/journal/test-journal-flush.c +++ b/src/journal/test-journal-flush.c @@ -44,7 +44,7 @@ int main(int argc, char *argv[]) { r = journal_file_move_to_object(f, OBJECT_ENTRY, f->current_offset, &o); assert_se(r >= 0); - r = journal_file_copy_entry(f, new_journal, o, f->current_offset, NULL, NULL, NULL); + r = journal_file_copy_entry(f, new_journal, o, f->current_offset); assert_se(r >= 0); n++; -- 2.7.4