refs/files: remove useless indirection

The function `files_fsck_refs()` only has a single callsite and forwards
all of its arguments as-is, so it's basically a useless indirection.
Inline the function call.

While at it, also remove the bitwise or that we have for return values.
We don't really want to or them at all, but rather just want to return
an error in case either of the functions has failed.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/refs/files-backend.c b/refs/files-backend.c
index 0a104c7..4cbee23 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -3954,22 +3954,20 @@ out:
        return ret;
 }
 
-static int files_fsck_refs(struct ref_store *ref_store,
-                          struct fsck_options *o,
-                          struct worktree *wt)
-{
-       return files_fsck_refs_dir(ref_store, o, wt);
-}
-
 static int files_fsck(struct ref_store *ref_store,
                      struct fsck_options *o,
                      struct worktree *wt)
 {
        struct files_ref_store *refs =
                files_downcast(ref_store, REF_STORE_READ, "fsck");
+       int ret = 0;
 
-       return files_fsck_refs(ref_store, o, wt) |
-              refs->packed_ref_store->be->fsck(refs->packed_ref_store, o, wt);
+       if (files_fsck_refs_dir(ref_store, o, wt) < 0)
+               ret = -1;
+       if (refs->packed_ref_store->be->fsck(refs->packed_ref_store, o, wt) < 0)
+               ret = -1;
+
+       return ret;
 }
 
 struct ref_storage_be refs_be_files = {