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.

3 files changed, 7 insertions, 7 deletions

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)));
 }
 
 
diff --git a/src/journals.h b/src/journals.h
index 1cbe660..b0fbfe2 100644
--- a/src/journals.h
+++ b/src/journals.h
@@ -26,7 +26,7 @@ THUNK_DECLARE(journals_open, iou_t *, iou, char **, machid, int, flags, journals
 THUNK_DECLARE(journal_get_header, iou_t *, iou, journal_t **, journal, Header *, header, thunk_t *, closure);
 
 THUNK_DECLARE(journal_iter_next_object, iou_t *, iou, journal_t **, journal, Header *, header, uint64_t *, iter_offset, ObjectHeader *, iter_object_header, thunk_t *, closure);
-THUNK_DECLARE(journal_for_each, iou_t *, iou, journal_t **, journal, Header *, header, uint64_t *, iter_offset, ObjectHeader *, iter_object_header, thunk_t *, closure);
+THUNK_DECLARE(journal_iter_objects, iou_t *, iou, journal_t **, journal, Header *, header, uint64_t *, iter_offset, ObjectHeader *, iter_object_header, thunk_t *, closure);
 
 THUNK_DECLARE(journal_get_hash_table, iou_t *, iou, journal_t **, journal, uint64_t *, hash_table_offset, uint64_t *, hash_table_size, HashItem **, res_hash_table, thunk_t *, closure);
 THUNK_DECLARE(journal_hash_table_iter_next_object, iou_t *, iou, journal_t **, journal, HashItem **, hash_table, uint64_t *, hash_table_size, uint64_t *, iter_bucket, uint64_t *, iter_offset, HashedObjectHeader *, iter_object_header, size_t, iter_object_size, thunk_t *, closure);
diff --git a/src/report-usage.c b/src/report-usage.c
index d27121a..d19eb0e 100644
--- a/src/report-usage.c
+++ b/src/report-usage.c
@@ -88,7 +88,7 @@ THUNK_DEFINE_STATIC(per_journal, iou_t *, iou, journal_t **, journal_iter, usage
 	(*n_journals)++;
 
 	return journal_get_header(iou, &foo->journal, &foo->header, THUNK(
-			journal_for_each(iou, &foo->journal, &foo->header, &foo->iter_offset, &foo->iter_object_header, THUNK_INIT(
+			journal_iter_objects(iou, &foo->journal, &foo->header, &foo->iter_offset, &foo->iter_object_header, THUNK_INIT(
 				per_data_object(closure, &foo->iter_object_header, &foo->usage, total_usage)))));
 }