From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kbG8k-00006t-8J for mharc-grub-devel@gnu.org; Fri, 06 Nov 2020 23:47:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kbG8i-0008SZ-22 for grub-devel@gnu.org; Fri, 06 Nov 2020 23:47:48 -0500 Received: from mail-ot1-x32c.google.com ([2607:f8b0:4864:20::32c]:35786) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kbG8e-0002qn-JU for grub-devel@gnu.org; Fri, 06 Nov 2020 23:47:47 -0500 Received: by mail-ot1-x32c.google.com with SMTP id n11so3342554ota.2 for ; Fri, 06 Nov 2020 20:47:43 -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=7sYXN2ve+VW2Lf2obNwpkiRCkSgWoyfUQMCFy2JhmQc=; b=cIDgiIH/Y3lXIpENLvcqFAztoX8hnubV6aPRrsnJkViFx8EGQfROtIFx3PGLJ4hbn8 aF3eBiKFwmit2T+ra8nrti1RNT5h1AxyTXXbZDpagLXeEjdU6oQom9rg1PB490pyIyuz aIS/B98o+Ym6IeUHuwW0ib34f7EVPmG2HQEcrz5wi75XnzDtTVNDgE0FCP6EkK8XLg8t DGl6Lxvzn9AWC/5wmAIByl8U5hAqPZePfdxPh4ifuqLl7Fy4LisQYSJzu6F6cbqSFafd 5Jy1ruFkW4OjbUvKzCBlfaYP8y4cnei4yTCCHks34FyasTC7eqgcTyl+VJgSULA1PvSb bxCg== 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=7sYXN2ve+VW2Lf2obNwpkiRCkSgWoyfUQMCFy2JhmQc=; b=gZUMq4BSLXrk7HnQ2eT9EfzxDdbN/rcsx1xdhQLbYURtlGq/NVurGXRYRkJ8++b2yw TmuFgnJUjyD4eJngf6li9hAZGLJnt4InQDFhxvQT42An6xoJDoY0djPFBa02rOAQ62W0 qUlwryCSn20XvBrfxE9pY+fGrsT+CF+7oKAvK+cc+Zv4AfR+4mIqnoMMANz7jiBSPYg6 G8+nop/XliIlK/ZCsLBCOwp7lSoafTtApj7gKe2vVGZVJl1/PB4JrX+VW/iaWceBcRI8 mjE+MN9droqGMFxByN+DcBj3TCcqYm5RXfdhC9aGaK06bKhnMkHScfv7d3F3efWLLULu YSvQ== X-Gm-Message-State: AOAM532Z14jP8b2keYjM4WQhv17RTTrFktDQ3kHYkktcOb5tZfbpPKPo 40Xl3IKszatftLl6D1sL9XsbMemQRd15E+tB X-Google-Smtp-Source: ABdhPJxx6fxKSbzTWY7uKffylXSuEx9o90Ajvq2l3ObAlpgcvw/XO3BWPlAnFeDK29BJaIeWuPF/+g== X-Received: by 2002:a05:6830:1589:: with SMTP id i9mr3412835otr.273.1604724462211; Fri, 06 Nov 2020 20:47:42 -0800 (PST) Received: from localhost.localdomain ([136.49.44.103]) by smtp.gmail.com with ESMTPSA id x25sm836888oie.17.2020.11.06.20.47.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Nov 2020 20:47:41 -0800 (PST) From: Glenn Washburn To: grub-devel@gnu.org Cc: Patrick Steinhardt , Daniel Kiper , Glenn Washburn Subject: [PATCH v4 07/15] luks2: Rename index variable j to i. Date: Fri, 6 Nov 2020 22:44:27 -0600 Message-Id: <21a3962b91508d1a0df568001fb04793ee13f841.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::32c; envelope-from=development@efficientek.com; helo=mail-ot1-x32c.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:48 -0000 Looping variable j was named such because the variable name i was taken. Since i has been renamed in the previous patch, we can rename j to i. Signed-off-by: Glenn Washburn --- grub-core/disk/luks2.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c index 2830f83cf..d96764a02 100644 --- a/grub-core/disk/luks2.c +++ b/grub-core/disk/luks2.c @@ -258,7 +258,7 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_luks2_digest_t *d, grub_luks2_s const grub_json_t *root, grub_size_t keyslot_idx) { grub_json_t keyslots, keyslot, digests, digest, segments, segment; - grub_size_t j, size; + grub_size_t i, size; grub_uint64_t idx; /* Get nth keyslot */ @@ -273,35 +273,35 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_luks2_digest_t *d, grub_luks2_s if (grub_json_getvalue (&digests, root, "digests") || grub_json_getsize (&size, &digests)) return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not get digests"); - for (j = 0; j < size; j++) + for (i = 0; i < size; i++) { - if (grub_json_getchild (&digest, &digests, j) || + if (grub_json_getchild (&digest, &digests, i) || grub_json_getchild (&digest, &digest, 0) || luks2_parse_digest (d, &digest)) - return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse digest %"PRIuGRUB_SIZE, j); + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse digest %"PRIuGRUB_SIZE, i); if ((d->keyslots & (1 << idx))) break; } - if (j == size) + if (i == 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") || grub_json_getsize (&size, &segments)) return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not get segments"); - for (j = 0; j < size; j++) + for (i = 0; i < size; i++) { - if (grub_json_getchild (&segment, &segments, j) || + if (grub_json_getchild (&segment, &segments, i) || grub_json_getuint64 (&idx, &segment, NULL) || grub_json_getchild (&segment, &segment, 0) || luks2_parse_segment (s, &segment)) - return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse segment %"PRIuGRUB_SIZE, j); + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse segment %"PRIuGRUB_SIZE, i); if ((d->segments & (1 << idx))) break; } - if (j == size) + if (i == size) return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No segment for digest %"PRIuGRUB_SIZE); return GRUB_ERR_NONE; -- 2.27.0