From 99fa79945cdf5947bc9d12e3f506aa4cfb78cdce Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Sun, 29 Nov 2020 14:36:05 -0800 Subject: journals: s/journal_for_each/journal_iter_objects/ Make naming a bit more descriptive and consistent... journals_for_each() is a simple non-IO-incurring journals array iteration, journal_for_each() generates IO and walks the data objects hash table... they're quite different, and shouldn't have such similar names. --- src/journals.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/journals.c') diff --git a/src/journals.c b/src/journals.c index 05b2d7a..0ced279 100644 --- a/src/journals.c +++ b/src/journals.c @@ -294,8 +294,8 @@ THUNK_DEFINE(journal_iter_next_object, iou_t *, iou, journal_t **, journal, Head } -/* Helper for the journal_for_each() simple objects iteration. */ -THUNK_DEFINE_STATIC(journal_for_each_dispatch, iou_t *, iou, journal_t **, journal, Header *, header, uint64_t *, iter_offset, ObjectHeader *, iter_object_header, thunk_t *, closure) +/* Helper for the journal_iter_objects() simple objects iteration. */ +THUNK_DEFINE_STATIC(journal_iter_objects_dispatch, iou_t *, iou, journal_t **, journal, Header *, header, uint64_t *, iter_offset, ObjectHeader *, iter_object_header, thunk_t *, closure) { int r; @@ -307,7 +307,7 @@ THUNK_DEFINE_STATIC(journal_for_each_dispatch, iou_t *, iou, journal_t **, journ return r; return journal_iter_next_object(iou, journal, header, iter_offset, iter_object_header, THUNK( - journal_for_each_dispatch(iou, journal, header, iter_offset, iter_object_header, closure))); + journal_iter_objects_dispatch(iou, journal, header, iter_offset, iter_object_header, closure))); } @@ -317,14 +317,14 @@ THUNK_DEFINE_STATIC(journal_for_each_dispatch, iou_t *, iou, journal_t **, journ * closure is simply dispatched in a loop, no continuation is passed to it for * resuming iteration, which tends to limit its use to simple situations. */ -THUNK_DEFINE(journal_for_each, iou_t *, iou, journal_t **, journal, Header *, header, uint64_t *, iter_offset, ObjectHeader *, iter_object_header, thunk_t *, closure) +THUNK_DEFINE(journal_iter_objects, iou_t *, iou, journal_t **, journal, Header *, header, uint64_t *, iter_offset, ObjectHeader *, iter_object_header, thunk_t *, closure) { assert(iter_offset); *iter_offset = 0; return journal_iter_next_object(iou, journal, header, iter_offset, iter_object_header, THUNK( - journal_for_each_dispatch(iou, journal, header, iter_offset, iter_object_header, closure))); + journal_iter_objects_dispatch(iou, journal, header, iter_offset, iter_object_header, closure))); } -- cgit v1.2.3