[PATCH v2 3/4] xprepare: simplify error handling
- From
- Phillip Wood <phillip.wood123@gmail.com>
- Date
- May 4, 2026, 14:06 UTC
- Message-ID
- <24e65d42b72a4e302bdb16125ce75f24659cd8a5.1777903579.git.phillip.wood@dunelm.org.uk>
- In-Reply-To
- <cover.1777903579.git.phillip.wood@dunelm.org.uk>
From: Phillip Wood <phillip.wood@dunelm.org.uk>
If either of the two allocations fail we want to take the same action so use a single if statement. This saves a few lines and makes it easier for the next commit to add a couple more allocations.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> --- xdiff/xprepare.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c index 81de412875a..7a29e5fc474 100644 --- a/xdiff/xprepare.c +++ b/xdiff/xprepare.c @@ -282,11 +282,8 @@ static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xd * Create temporary arrays that will help us decide if * changed[i] should remain false, or become true. */ - if (!XDL_CALLOC_ARRAY(action1, len1)) { - ret = -1; - goto cleanup; - } - if (!XDL_CALLOC_ARRAY(action2, len2)) { + if (!XDL_CALLOC_ARRAY(action1, len1) || + !XDL_CALLOC_ARRAY(action2, len2)) { ret = -1; goto cleanup; }
-- 2.54.0.rc1.174.gd833f386ac5.dirty