From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kmlkf-0004jD-VY for mharc-grub-devel@gnu.org; Tue, 08 Dec 2020 17:46:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmlkZ-0004de-Uz for grub-devel@gnu.org; Tue, 08 Dec 2020 17:46:31 -0500 Received: from mail-oi1-x230.google.com ([2607:f8b0:4864:20::230]:35498) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kmlkQ-0000jJ-26 for grub-devel@gnu.org; Tue, 08 Dec 2020 17:46:27 -0500 Received: by mail-oi1-x230.google.com with SMTP id s2so348731oij.2 for ; Tue, 08 Dec 2020 14:46:15 -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=jIP/cPjxUNYzsj+NJRDWgSE8XN5cOuU3nnEg34aT9Pg=; b=vZNA0hMdo3i/ieTo8wRefNT4JNHdccgCIlAGh5IrbFpfseTFvUZuBuX68iotcs/Sto N4Mj7dQMkTC51Gm+TMGwtrCWrGWKO6sNhwMzJZKD8OGbeculdfvZ0LmnoK+Q9A/0XMFW YJ3Xb0sr2wY/aFvdipZ0Wg6RH+wxz9axAnG5hzForLBLScAB9otU1Wng6SujylUb6JCK Bnc27V2tT5bYnOvszruYt8COgZJjx1RvOeBfUOeRckvNIeTzS/j0ry5gSs7nWAai+EjD nLD/P06H4gbUBU1XCZ49YkU0KD15HU+HguossC5qVdDuDf+C9E0P1NSCHgjad/7xl2mn raJQ== 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=jIP/cPjxUNYzsj+NJRDWgSE8XN5cOuU3nnEg34aT9Pg=; b=XU6HemuCVrh6wshxq2Rid8S3T2wjJvCNqrFjeW6eAt/boXp/bB6f7KysKTX8DRUOy1 y4ljxXvcA4h+sPp2yODrnJe/OTHxEX6P4FVo0YF8VSZfPqcNTa/05MXuXquu3BeGjhsV jp+d2GKcrU7lrdO4k7Ki1yQpPqozlTyCV4+wkrajXMmrGnJ0tW2HGGez03sG1sy7IBhX Pr1ESJvcjiS7Qku898utJLDAsJUWpqTUY2VaZUnLd6+AmN+U38Hong4e7YLDBJOsfn5g 5Imfm0pUFjJX1YhqJ1qKsSXUmfLmIPCCDGuUHIyOj0CL3v5vAf/gjytMcPEBob5Wxgwh lHpw== X-Gm-Message-State: AOAM532o9FCqC86IOIu/LnGX9IWEtdt48fF9r6y2DTlUr9FzgEn/10AR t98H6+WjDzJgJWJ4e4KHD661u/Qks+KDxg== X-Google-Smtp-Source: ABdhPJzHbLEIG+wCpElsVsgfnh2XhzJbu64lHzbVkiYfWaeOxDIou9T7ZYmpH0loRTYvnJlm8XhWCQ== X-Received: by 2002:aca:5609:: with SMTP id k9mr80548oib.179.1607467574295; Tue, 08 Dec 2020 14:46:14 -0800 (PST) Received: from crass-HP-ZBook-15-G2.attlocal.net ([136.49.211.192]) by smtp.gmail.com with ESMTPSA id v8sm45538otp.10.2020.12.08.14.46.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Dec 2020 14:46:13 -0800 (PST) From: Glenn Washburn To: grub-devel@gnu.org Cc: Patrick Steinhardt , Daniel Kiper , Glenn Washburn , Daniel Kiper Subject: [PATCH v8 03/18] whitespace: convert 8 spaces to tabs Date: Tue, 8 Dec 2020 16:45:34 -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=2607:f8b0:4864:20::230; envelope-from=development@efficientek.com; helo=mail-oi1-x230.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: Tue, 08 Dec 2020 22:46:31 -0000 Signed-off-by: Glenn Washburn Reviewed-by: Daniel Kiper Reviewed-by: Patrick Steinhardt --- 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 d96764a02..66e3b8798 100644 --- a/grub-core/disk/luks2.c +++ b/grub-core/disk/luks2.c @@ -276,8 +276,8 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_luks2_digest_t *d, grub_luks2_s for (i = 0; i < size; i++) { if (grub_json_getchild (&digest, &digests, i) || - 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 %"PRIuGRUB_SIZE, i); if ((d->keyslots & (1 << idx))) @@ -295,7 +295,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 (&idx, &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 %"PRIuGRUB_SIZE, i); if ((d->segments & (1 << idx))) @@ -600,7 +600,7 @@ luks2_recover_key (grub_disk_t source, { grub_dprintf ("luks2", "Ignoring keyslot %"PRIuGRUB_SIZE" due to priority\n", i); continue; - } + } grub_dprintf ("luks2", "Trying keyslot %"PRIuGRUB_SIZE"\n", i); -- 2.27.0