xprepare: simplify error handling
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Phillip Wood committed
May 4, 2026 at 15:06 UTC
c8eb18f58607057a812654bdfca3e6b47bd0ffe4
1 file changed
+2
-5
xdiff/xprepare.c
+2
-5
index 81de412875..7a29e5fc47 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;
}