diff options
author | Lennart Poettering <lennart@poettering.net> | 2018-02-19 17:40:01 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2018-02-20 15:39:30 +0100 |
commit | fc1813c0fe1f293909dbf4c6e67db0b86f476b8d (patch) | |
tree | 3d812875117eefff68dcd61d8ee1b5d9e7a87efb /src/journal/sd-journal.c | |
parent | 817b1c5b1e9af0a2cac9b895f1880ff61812f8cf (diff) | |
download | systemd-fc1813c0fe1f293909dbf4c6e67db0b86f476b8d.tar.gz |
sd-journal: rename add_file() → add_file_by_name()
Let's be more careful with the naming, and indicate that the function
is about *named* journal files, and will validate the name as needed.
(in opposition to add_any_file() which doesn't care about names)
Diffstat (limited to 'src/journal/sd-journal.c')
-rw-r--r-- | src/journal/sd-journal.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c index 8a591205c4..3062367385 100644 --- a/src/journal/sd-journal.c +++ b/src/journal/sd-journal.c @@ -1333,7 +1333,11 @@ fail: return r; } -static int add_file(sd_journal *j, const char *prefix, const char *filename) { +static int add_file_by_name( + sd_journal *j, + const char *prefix, + const char *filename) { + const char *path; assert(j); @@ -1350,7 +1354,11 @@ static int add_file(sd_journal *j, const char *prefix, const char *filename) { return add_any_file(j, -1, path); } -static void remove_file(sd_journal *j, const char *prefix, const char *filename) { +static void remove_file_by_name( + sd_journal *j, + const char *prefix, + const char *filename) { + const char *path; JournalFile *f; @@ -1370,7 +1378,7 @@ static void remove_file_real(sd_journal *j, JournalFile *f) { assert(j); assert(f); - ordered_hashmap_remove(j->files, f->path); + (void) ordered_hashmap_remove(j->files, f->path); log_debug("File %s removed.", f->path); @@ -1463,8 +1471,9 @@ static void directory_enumerate(sd_journal *j, Directory *m, DIR *d) { assert(d); FOREACH_DIRENT_ALL(de, d, goto fail) { + if (dirent_is_journal_file(de)) - (void) add_file(j, m->path, de->d_name); + (void) add_file_by_name(j, m->path, de->d_name); if (m->is_root && dirent_is_id128_subdir(de)) (void) add_directory(j, m->path, de->d_name); @@ -2499,9 +2508,9 @@ static void process_inotify_event(sd_journal *j, struct inotify_event *e) { /* Event for a journal file */ if (e->mask & (IN_CREATE|IN_MOVED_TO|IN_MODIFY|IN_ATTRIB)) - (void) add_file(j, d->path, e->name); + (void) add_file_by_name(j, d->path, e->name); else if (e->mask & (IN_DELETE|IN_MOVED_FROM|IN_UNMOUNT)) - remove_file(j, d->path, e->name); + remove_file_by_name(j, d->path, e->name); } else if (!d->is_root && e->len == 0) { |