picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

journal: use new helpers with journal_file_close 

journal_file_close_set() is not necessary anymore.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-11-28 12:40:14 +01:00
parent 1599f593d6
commit f916819053
4 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/journal/journal-file.c
View File

@ -400,15 +400,6 @@ JournalFile* journal_file_close(JournalFile *f) {
return mfree(f);
}
void journal_file_close_set(Set *s) {
JournalFile *f;
assert(s);
while ((f = set_steal_first(s)))
(void) journal_file_close(f);
}
static int journal_file_init_header(JournalFile *f, JournalFile *template) {
Header h = {};
ssize_t k;
@ -3371,8 +3362,7 @@ int journal_file_open(
f->header = h;
if (!newly_created) {
if (deferred_closes)
journal_file_close_set(deferred_closes);
set_clear_with_destructor(deferred_closes, journal_file_close);
r = journal_file_verify_header(f);
if (r < 0)

1
src/journal/journal-file.h
View File

@ -161,7 +161,6 @@ int journal_file_open(
int journal_file_set_offline(JournalFile *f, bool wait);
bool journal_file_is_offlining(JournalFile *f);
JournalFile* journal_file_close(JournalFile *j);
void journal_file_close_set(Set *s);
int journal_file_open_reliably(
const char *fname,

11
src/journal/journald-server.c
View File

@ -1899,13 +1899,9 @@ void server_maybe_append_tags(Server *s) {
}
void server_done(Server *s) {
JournalFile *f;
assert(s);
if (s->deferred_closes) {
journal_file_close_set(s->deferred_closes);
set_free(s->deferred_closes);
}
set_free_with_destructor(s->deferred_closes, journal_file_close);
while (s->stdout_streams)
stdout_stream_free(s->stdout_streams);
@ -1918,10 +1914,7 @@ void server_done(Server *s) {
if (s->runtime_journal)
(void) journal_file_close(s->runtime_journal);
while ((f = ordered_hashmap_steal_first(s->user_journals)))
(void) journal_file_close(f);
ordered_hashmap_free(s->user_journals);
ordered_hashmap_free_with_destructor(s->user_journals, journal_file_close);
sd_event_source_unref(s->syslog_event_source);
sd_event_source_unref(s->native_event_source);

6
src/journal/sd-journal.c
View File

@ -1977,17 +1977,13 @@ fail:
_public_ void sd_journal_close(sd_journal *j) {
Directory *d;
JournalFile *f;
if (!j)
return;
sd_journal_flush_matches(j);
while ((f = ordered_hashmap_steal_first(j->files)))
(void) journal_file_close(f);
ordered_hashmap_free(j->files);
ordered_hashmap_free_with_destructor(j->files, journal_file_close);
while ((d = hashmap_first(j->directories_by_path)))
remove_directory(j, d);