Skip to content

Commit 4525684

Browse files
phillipwoodgitster
authored andcommitted
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>
1 parent 44332ae commit 4525684

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

xdiff/xprepare.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -282,11 +282,8 @@ static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xd
282282
* Create temporary arrays that will help us decide if
283283
* changed[i] should remain false, or become true.
284284
*/
285-
if (!XDL_CALLOC_ARRAY(action1, len1)) {
286-
ret = -1;
287-
goto cleanup;
288-
}
289-
if (!XDL_CALLOC_ARRAY(action2, len2)) {
285+
if (!XDL_CALLOC_ARRAY(action1, len1) ||
286+
!XDL_CALLOC_ARRAY(action2, len2)) {
290287
ret = -1;
291288
goto cleanup;
292289
}

0 commit comments

Comments
 (0)