From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kh4Kv-0008Nw-5D for mharc-grub-devel@gnu.org; Mon, 23 Nov 2020 00:24:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40684) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kh4Kr-0008KJ-O0 for grub-devel@gnu.org; Mon, 23 Nov 2020 00:24:22 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:40039) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kh4Kp-0006aG-LP for grub-devel@gnu.org; Mon, 23 Nov 2020 00:24:21 -0500 Received: by mail-wm1-x341.google.com with SMTP id a3so16081898wmb.5 for ; Sun, 22 Nov 2020 21:24:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficientek-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jFSFd9sRCyy/OvEXL31WsJS6HzgkZbhLpQ6mjPdO4XA=; b=dnflsDMHaVuImDQAgb/7jc6wDy2tnO6Of4ha8Z98bz9CXpFsZRY0xgYr3mFF2D8LH8 XN38ikAlSHb4seF3i80PQMykvBmyVyftew3Twsl5qmDHdKVLQuJNhy56oNy1AugDUQdy MoXN4ukol8TckBQt7PCfiWVH+O7fWKlhnDMH1+CgjG8qet7Rx67Gdqpa8gciFinNPHWk IWMQdpJZFaMl78VrFxpqyHK55dUhrJOi2MJIuVET7JNlxWfZvmsU7u2j6o7WIJr8rI7A 73nJrrgD5FlyPLtf+ursHoDRoUoyDiYZvHXq45STsQnhoPN0mDBRMVuXugSgICGyMzaY vkBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jFSFd9sRCyy/OvEXL31WsJS6HzgkZbhLpQ6mjPdO4XA=; b=epUXq3DBduwuz3uuPy9gTwRCF4+UeKZEt91XeqCCD5fZLUAQc87iTFn80xYP4RMLR9 /Av92fnEko6xiaCsN7OiNQqyAAlMwabqFJ9WU/fvVnfMuc0ZTvrlIR80OmnZ+hdO1bEg D+MPHgDwoByxbNVnGnpifHRepczN4WjauOgQ3rZJKkIiJzDeFDw2AGb+wBE+/kG/b9NH l953lPJHC9kIY3WAtN5bE/YCoHP20Iew9+dq39wt0GbHgpZKDbqQJnr8DLJ1+fQXOHg7 Pv1u15A/vRZDpvJoylWhX3CbTNHJY8Y2WehzqL5PEh0uCiFJd1CcyotAQ54xfs9rc1ri QxiQ== X-Gm-Message-State: AOAM530ygUTBiTcVUNm9VU/aQJucIPxgEepouX8mqBPeZ2AAROacKuLP s6IctpcvV3o3mfSOjg4EEK24WtTI/aXkjQ== X-Google-Smtp-Source: ABdhPJwYiJg2w9OqCpi8Oiy/0Vb9T/b/39j279tiNkH1Ihdh69n+OPTZc4PB8lIkCJ1wVeXenHkSYQ== X-Received: by 2002:a7b:c841:: with SMTP id c1mr21245671wml.31.1606109058189; Sun, 22 Nov 2020 21:24:18 -0800 (PST) Received: from localhost.localdomain ([136.49.211.192]) by smtp.gmail.com with ESMTPSA id f16sm11631780wmh.7.2020.11.22.21.24.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Nov 2020 21:24:17 -0800 (PST) From: Glenn Washburn To: grub-devel@gnu.org Cc: Patrick Steinhardt , Daniel Kiper , Glenn Washburn Subject: [PATCH v5 08/11] whitespace: convert 8 spaces to tabs. Date: Sun, 22 Nov 2020 23:23:21 -0600 Message-Id: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=development@efficientek.com; helo=mail-wm1-x341.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Nov 2020 05:24:22 -0000 Signed-off-by: Glenn Washburn --- grub-core/disk/luks2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c index 0d838f2e0..7e7b79d17 100644 --- a/grub-core/disk/luks2.c +++ b/grub-core/disk/luks2.c @@ -279,8 +279,8 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_luks2_digest_t *d, grub_luks2_s { if (grub_json_getchild (&digest, &digests, i) || grub_json_getuint64 (&d->slot_key, &digest, NULL) || - grub_json_getchild (&digest, &digest, 0) || - luks2_parse_digest (d, &digest)) + grub_json_getchild (&digest, &digest, 0) || + luks2_parse_digest (d, &digest)) return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse digest index %"PRIuGRUB_SIZE, i); if ((d->keyslots & (1 << k->slot_key))) @@ -298,7 +298,7 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_luks2_digest_t *d, grub_luks2_s if (grub_json_getchild (&segment, &segments, i) || grub_json_getuint64 (&s->slot_key, &segment, NULL) || grub_json_getchild (&segment, &segment, 0) || - luks2_parse_segment (s, &segment)) + luks2_parse_segment (s, &segment)) return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse segment index %"PRIuGRUB_SIZE, i); if ((d->segments & (1 << s->slot_key))) @@ -622,7 +622,7 @@ luks2_recover_key (grub_disk_t source, { grub_dprintf ("luks2", "Ignoring keyslot %"PRIuGRUB_UINT64_T" due to priority\n", keyslot.slot_key); continue; - } + } grub_dprintf ("luks2", "Trying keyslot %"PRIuGRUB_UINT64_T"\n", keyslot.slot_key); -- 2.27.0