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>

diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c
index 81de412875abb4d86e95278ea72054a60a47e548..7a29e5fc4748e22957dd78af102b8c1f337cf1ee 100644 (file)
--- 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;
        }