From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1klEop-0000py-Ca for mharc-grub-devel@gnu.org; Fri, 04 Dec 2020 12:24:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40378) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1klEir-0008Rp-K4 for grub-devel@gnu.org; Fri, 04 Dec 2020 12:18:39 -0500 Received: from mail-qk1-x72e.google.com ([2607:f8b0:4864:20::72e]:35062) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1klEh9-0000jA-W1 for grub-devel@gnu.org; Fri, 04 Dec 2020 12:17:53 -0500 Received: by mail-qk1-x72e.google.com with SMTP id v143so6106819qkb.2 for ; Fri, 04 Dec 2020 09:15:54 -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=yuBNkTawn+Y+mJnC6he6KZuXL+3ieQWhLXvUSH+7f/8=; b=YPfx1IXhR9B+ME+TckSZrNVJcIc9nZNzHoElxLpAMqtE4hnckqmNAWX5+7NLWI5KI2 BZlSmngGOZA08ZMD+0J+lE41DOkbTThCtkgFARBzWu01V5gQsRkGTCDwU2BEur81dPKt Bx3ZSkos4qUJbvPF/EwA9Mb6bJWiqXw3VcJNwoUUfipxzO2gYPNMhpzgOZm5V//E64uo n31rd15fFK68vk4AqVkD/wX1jua/7ySQ3reRONbQDxSDmIq6ubD1WIGBRK0nMhoa1pYL wPRK486qZe2iMop7jHN0vWZ473F85LLl8EGq80BEn60busa4xeVl69gZwbD6+wlo1g/B 1FdA== 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=yuBNkTawn+Y+mJnC6he6KZuXL+3ieQWhLXvUSH+7f/8=; b=oYVWemp/r1OITnUHhocRKgrCP78CUhK3+kSPtJFsK8jkhVVMEvR/aRu89jj4yUwo5Q FHc1Z78TdQwwcs83DtUqZFfgZBGzNydnv81i0MGqBcLBvTKE7iM+PTDF8kSZzX/vb7ER f5GsaZl0nJlj8zy+PVg0ZtrZH8J+5PJMxhkzUOcEqMp65rj0JiGMDzQImwVhOeTl7RP5 a1r+6W6nwDcbXjq8lwc1IMFB8CWf5Qsuzt5gYZrK2+e6t3M4xiqCivfeNe/Xy4RB5wh0 Uz1PIYasNdYCgwtmtXM2Phj2pgVvxog+PmiLbwagUJdaW4pzBzbaRFeseAHHbaIOA/DO f/wA== X-Gm-Message-State: AOAM53296vWETStzgpveD+/F9nnA7xiIhR9bFGwVqZGFRh6vmVexxQHT sFwhdYfecr4Xl4BYeGWQIrwb2DEvWoeieA== X-Google-Smtp-Source: ABdhPJxOJfkyOmbdusS0cTn2zBsEuaN6UvTnMoWQQn0zjCKOqM3JGOd4Os5YRx6BVMN7U6EN3jsdDQ== X-Received: by 2002:a05:6638:d4e:: with SMTP id d14mr7612691jak.26.1607100269732; Fri, 04 Dec 2020 08:44:29 -0800 (PST) Received: from localhost.localdomain ([136.49.211.192]) by smtp.gmail.com with ESMTPSA id w3sm1754909iol.9.2020.12.04.08.44.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Dec 2020 08:44:29 -0800 (PST) From: Glenn Washburn To: grub-devel@gnu.org Cc: Patrick Steinhardt , Daniel Kiper , Glenn Washburn , Daniel Kiper Subject: [PATCH v7 14/17] whitespace: convert 8 spaces to tabs Date: Fri, 4 Dec 2020 10:43:43 -0600 Message-Id: <74eed4a62dd2acb631ce90efb0f3847ce12ff238.1607098915.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=2607:f8b0:4864:20::72e; envelope-from=development@efficientek.com; helo=mail-qk1-x72e.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, 04 Dec 2020 17:19:11 -0000 X-List-Received-Date: Fri, 04 Dec 2020 17:19:11 -0000 Reviewed-by: Daniel Kiper 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 499c9330b..2335ded77 100644 --- a/grub-core/disk/luks2.c +++ b/grub-core/disk/luks2.c @@ -282,8 +282,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->json_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->json_slot_key))) @@ -301,7 +301,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->json_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->json_slot_key))) @@ -625,7 +625,7 @@ luks2_recover_key (grub_disk_t source, { grub_dprintf ("luks2", "Ignoring keyslot \"%"PRIuGRUB_UINT64_T"\" due to priority\n", keyslot.json_slot_key); continue; - } + } grub_dprintf ("luks2", "Trying keyslot \"%"PRIuGRUB_UINT64_T"\"\n", keyslot.json_slot_key); -- 2.27.0