From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kbG8g-0008PR-U3 for mharc-grub-devel@gnu.org; Fri, 06 Nov 2020 23:47:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kbG8f-0008Ms-MT for grub-devel@gnu.org; Fri, 06 Nov 2020 23:47:45 -0500 Received: from mail-ot1-x342.google.com ([2607:f8b0:4864:20::342]:44612) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kbG8c-0002qe-W8 for grub-devel@gnu.org; Fri, 06 Nov 2020 23:47:45 -0500 Received: by mail-ot1-x342.google.com with SMTP id f16so3314621otl.11 for ; Fri, 06 Nov 2020 20:47:41 -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=J+/WKcTnpBgLmO8ocSWtVTx0xVnTB4OVV8fK6gG+Bk4=; b=YNkiYubU0vn2tFOnR3TgDaEh2yBsji664I01iPaP8xT6M1az1rgxHTkTI00hUmKQIY 1OGEdyY/2UwdYA0s9ZzqP36EtPp5CyW0KuBaQ9SnLFt9UJIZmXmxncI+a0Wxs4vG1/O9 EpWU5XQO+SUrrvMzKKlhZ6kA33T8Q6+8g9X8mRJFrAHS/KtIq5EJI/Cboc86nwleA6gO F6BWSUWNPT8wdYfj3FI1xyt6z7lWGPV35Ckd+uyolTvu5dspBdTuWyMdC8JPgIvUJrBT idKSS6U+sm37RhoftQ2xu3zBNryLD8W6xAxGuO99zZfznix0Ia+cWTwApqO+mYnwgzzR Qn1A== 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=J+/WKcTnpBgLmO8ocSWtVTx0xVnTB4OVV8fK6gG+Bk4=; b=r2Bg3Epxa99aQolrP7OJHcLgs2sWHpMQSrjoPSrZWGQxGG3F/RxvGct2AomNP+ajwn TCz4/u72/lw7dOspt4Xew/K6aEE8icgjRzPzmuR5X7ZeEvKvmtjmOG1pd0DuCWMM7iAK DkNuvHsyBPWq+AGE0yWxPg9+tFEd4lbNbLb2wcHIVpdt1Qk1LYZqLfiaWwktcgeIUpIp c1uYr8oL45YCQygdqn1ZLjauDidhhzFzYdkyE6zE2HI9r6H93jZfvIcw/hlL0OO8TSyl B5Ul+Uc5Jw01WyXB0QKFNGa1gZ/7hbGSBTEKGHUq+1ZHxb3D0qX6kglcTKS9QHaA3PEh qlIg== X-Gm-Message-State: AOAM531pEeLgIa5+yhj20xwzIZiqiw/s5cGT1TkoZLWyCzE4hv2i0RTo foUG3uLAm3jEL6Se1UXCl19yZVxD78mv16dp X-Google-Smtp-Source: ABdhPJzvhjYOj7rCyB9pr9mCffR+FV5+72+JLYeT0+xJHzVhqidwyJMDssVIFFnjH90zRxS9cd4B7g== X-Received: by 2002:a05:6830:1694:: with SMTP id k20mr48815otr.144.1604724460648; Fri, 06 Nov 2020 20:47:40 -0800 (PST) Received: from localhost.localdomain ([136.49.44.103]) by smtp.gmail.com with ESMTPSA id x25sm836888oie.17.2020.11.06.20.47.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Nov 2020 20:47:40 -0800 (PST) From: Glenn Washburn To: grub-devel@gnu.org Cc: Patrick Steinhardt , Daniel Kiper , Glenn Washburn Subject: [PATCH v4 06/15] luks2: Rename variable i to keyslot_idx in luks2_get_keyslot. Date: Fri, 6 Nov 2020 22:44:26 -0600 Message-Id: <21b745c117c3681573b71a5315e26733e93fc5b0.1604723348.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::342; envelope-from=development@efficientek.com; helo=mail-ot1-x342.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: Sat, 07 Nov 2020 04:47:46 -0000 Variables named i are usually looping variables, so rename to keyslot_idx to allow for easier reading of luks2_get_keyslot. 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 be42deb14..2830f83cf 100644 --- a/grub-core/disk/luks2.c +++ b/grub-core/disk/luks2.c @@ -255,7 +255,7 @@ luks2_parse_digest (grub_luks2_digest_t *out, const grub_json_t *digest) static grub_err_t luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_luks2_digest_t *d, grub_luks2_segment_t *s, - const grub_json_t *root, grub_size_t i) + const grub_json_t *root, grub_size_t keyslot_idx) { grub_json_t keyslots, keyslot, digests, digest, segments, segment; grub_size_t j, size; @@ -263,11 +263,11 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_luks2_digest_t *d, grub_luks2_s /* Get nth keyslot */ if (grub_json_getvalue (&keyslots, root, "keyslots") || - grub_json_getchild (&keyslot, &keyslots, i) || + grub_json_getchild (&keyslot, &keyslots, keyslot_idx) || grub_json_getuint64 (&idx, &keyslot, NULL) || grub_json_getchild (&keyslot, &keyslot, 0) || luks2_parse_keyslot (k, &keyslot)) - return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse keyslot %"PRIuGRUB_SIZE, i); + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse keyslot %"PRIuGRUB_SIZE, keyslot_idx); /* Get digest that matches the keyslot. */ if (grub_json_getvalue (&digests, root, "digests") || @@ -284,7 +284,7 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_luks2_digest_t *d, grub_luks2_s break; } if (j == size) - return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No digest for keyslot %"PRIuGRUB_SIZE); + return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No digest for keyslot %"PRIuGRUB_SIZE, keyslot_idx); /* Get segment that matches the digest. */ if (grub_json_getvalue (&segments, root, "segments") || -- 2.27.0