From 18ec4ec5a59080353ed1ffbb3e2b87b92ca0ff05 Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Tue, 24 Aug 2021 02:29:42 -0700 Subject: verify-hashed-objects: clarify some return paths Just adding some missing thunk_{mid,end}() return value filters, which highlights some small optimization opportunities where these instances aren't being reused. Still on the fence about this life-cycle approach and naming though. --- src/verify-hashed-objects.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/verify-hashed-objects.c b/src/verify-hashed-objects.c index f5c2c74..0c9e56c 100644 --- a/src/verify-hashed-objects.c +++ b/src/verify-hashed-objects.c @@ -171,7 +171,7 @@ THUNK_DEFINE_STATIC(per_hashed_object, journal_t *, journal, Header *, header, O return -EBADMSG; } - return thunk_dispatch(closure); + return thunk_end(thunk_dispatch(closure)); } @@ -226,9 +226,9 @@ THUNK_DEFINE_STATIC(per_journal, iou_t *, iou, journal_t **, journal_iter) foo->journal = *journal_iter; foo->iter_object = foo->decompressed = NULL; - return journal_get_header(iou, &foo->journal, &foo->header, THUNK( + return thunk_end(journal_get_header(iou, &foo->journal, &foo->header, THUNK( journal_iter_next_object(iou, &foo->journal, &foo->header, &foo->iter_offset, &foo->iter_object_header, THUNK_INIT( - per_object(closure, closure, iou, &foo->journal, &foo->header, &foo->iter_offset, &foo->iter_object_header, &foo->iter_object, &foo->decompressed))))); + per_object(closure, closure, iou, &foo->journal, &foo->header, &foo->iter_offset, &foo->iter_object_header, &foo->iter_object, &foo->decompressed)))))); } -- cgit v1.2.3