diff options
author | Michal Schmidt <mschmidt@redhat.com> | 2014-12-12 21:52:18 +0100 |
---|---|---|
committer | Michal Schmidt <mschmidt@redhat.com> | 2014-12-13 00:46:40 +0100 |
commit | 1b8951e5bd9b2bf1722098a861055cae0bb52088 (patch) | |
tree | b4d7c2e0ddc819d510c5c8565226f11bb7ad6e1f /src/journal/mmap-cache.h | |
parent | fed67c38e3f1cecf4c0571f5603d47b35bff6576 (diff) |
journal: remove journal_file_object_keep/release functions
The only user is sd_journal_enumerate_unique() and, as explained in
the previous commit (fed67c38e3 "journal: map objects to context set by
caller, not by actual object type"), the use of them there is now
superfluous. Let's remove them.
This reverts major parts of commits:
ae97089d49 journal: fix access to munmapped memory in
sd_journal_enumerate_unique
06cc69d44c sd-journal: fix sd_journal_enumerate_unique skipping values
Tested with an "--enable-debug" build and "journalctl --list-boots".
It gives the expected number of results. Additionally, if I then revert
the previous commit ("journal: map objects to context set by caller, not
to actual object type"), it crashes with SIGSEGV, as expected.
Diffstat (limited to 'src/journal/mmap-cache.h')
-rw-r--r-- | src/journal/mmap-cache.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/journal/mmap-cache.h b/src/journal/mmap-cache.h index 76e5316248..3e2ffbbfd1 100644 --- a/src/journal/mmap-cache.h +++ b/src/journal/mmap-cache.h @@ -40,12 +40,7 @@ int mmap_cache_get( uint64_t offset, size_t size, struct stat *st, - void **ret, - void **release_cookie); -int mmap_cache_release( - MMapCache *m, - int fd, - void *release_cookie); + void **ret); void mmap_cache_close_fd(MMapCache *m, int fd); void mmap_cache_close_context(MMapCache *m, unsigned context); |