From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kiZgU-000516-Fu for mharc-grub-devel@gnu.org; Fri, 27 Nov 2020 04:04:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kiZgS-0004zK-K6 for grub-devel@gnu.org; Fri, 27 Nov 2020 04:04:52 -0500 Received: from mail-lj1-x22b.google.com ([2a00:1450:4864:20::22b]:42093) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kiZgQ-0005YA-HR for grub-devel@gnu.org; Fri, 27 Nov 2020 04:04:52 -0500 Received: by mail-lj1-x22b.google.com with SMTP id f18so5117059ljg.9 for ; Fri, 27 Nov 2020 01:04:50 -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=/pN8Zpq+xp6fYsxNJ1wioiMi+1/5nZF/z5sXhE34oDo=; b=o/qgqnKkZR+uSJ91OXkDA7I3Ik7zvcGP09XUUtbwa48fnE1+hbIn79eavgTp/9hUfe b2ojQqSPovnxahmCHy8yLHIG3/qe7Syr3GPzDcusFiAMelmqdf65RBPdXJHIEsBNwoHA VRHeF7oGqzJMppimC2OxqXxxKRoDUfVZ6kyLRbpHdwDrA9JbrZUfVsj0lNbYFiro/Vxl OsMGR1Hvj707JkxDaXui4/NRpW93MPS8tK774a6xEyoAxBCVBaHk90tqkwteg2a3xhuB D/dj3gpRLyceoK3i8JsG5omgBhuOKPSfYu3a5SuOVIdfszOYo2CxWTIwFAIqVPKt9Cpl XsVA== 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=/pN8Zpq+xp6fYsxNJ1wioiMi+1/5nZF/z5sXhE34oDo=; b=suOP8Ktn+Qm1qhKsu1rRZTESlRNy15vPBcLLZzRlCvo+a4UUb/wizuaW4s3Jln8Rik dbiSK8f+4vjbd6XvlXlJYylGcAbcqbXoOj0RxQxS9PWQBZqtKtx3D9lJUfO9eUhzMnlD c9985EUaFvgT64guH42lnXq05ZnmMSLWduQ016R0G/CDGWge1kNrx1NwB8+kyQ3ej5Yz rT9sQGiqd6/N+l6t1wbx/GH3teIMS9QrFXySb+zbkLB19xeALZeEpXPlzL9oTr84aW+8 VjMet3KAiIHP++vN482751sEQJX7pP1mdB21jNcznIDTVuDpM8OsaybbpiXxA8gmmDVu 49fw== X-Gm-Message-State: AOAM531UyNjjeEM9FPO1XAsMkRhZejB/MQk1QTBBrLxdjBDI4fqMmAYu dWX3OFgqMNGM2wdwroq6QaZJf7/HxBAfuA== X-Google-Smtp-Source: ABdhPJznJGESq8tLbSmVCNQcApH8EWd9Xy3WNTigjqHIijIyPW9pqb08xpR7vXEDiUmD4Vce0k3K/w== X-Received: by 2002:a2e:5815:: with SMTP id m21mr2683559ljb.361.1606467888594; Fri, 27 Nov 2020 01:04:48 -0800 (PST) Received: from localhost.localdomain ([136.49.211.192]) by smtp.gmail.com with ESMTPSA id g2sm880675lja.87.2020.11.27.01.04.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Nov 2020 01:04:48 -0800 (PST) From: Glenn Washburn To: grub-devel@gnu.org Cc: Patrick Steinhardt , Daniel Kiper , Glenn Washburn Subject: [PATCH v6 09/12] whitespace: convert 8 spaces to tabs. Date: Fri, 27 Nov 2020 03:03:41 -0600 Message-Id: <61f77a1a85a7e6367b6665b750de983b27d490ae.1606467382.git.development@efficientek.com> 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::22b; envelope-from=development@efficientek.com; helo=mail-lj1-x22b.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: Fri, 27 Nov 2020 09:04:52 -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 f2313cb0f..c2129f929 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