From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kbG8i-0008Un-RF for mharc-grub-devel@gnu.org; Fri, 06 Nov 2020 23:47:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kbG8g-0008Pd-Vp for grub-devel@gnu.org; Fri, 06 Nov 2020 23:47:46 -0500 Received: from mail-ot1-x344.google.com ([2607:f8b0:4864:20::344]:39673) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kbG8f-0002rj-9x for grub-devel@gnu.org; Fri, 06 Nov 2020 23:47:46 -0500 Received: by mail-ot1-x344.google.com with SMTP id z16so3329368otq.6 for ; Fri, 06 Nov 2020 20:47:44 -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=PtcTqxpDnDfqsFO7cI3/KlWjnGPuzmGuz8LzcVlQ3VY=; b=N44mh28yufgCP7nS+E4HABvvfb5GBGHQAcvT7tZOb9h+6oUqP1ylaomH9mVJo1Xhx/ j5JcmlP5akgFArNuyHYAJzCrz7Zidfn/poak1ga9tEIvAZzv+SKE6HK7Bo6cLQ1vDxkS mB/l1UNszYqdtSEXfmVCJ4Xc8iJGUhDUbFwXcy3OsmNt57mjOW6WGIyrv+90zzb3oxKD mAcYS5ZYZQhEZ5WbfBsEtDdcRgjUilpu1Ou7KiQHPkPKw7EvnPheqcd/wjRH/npRL9Yf CbdHk9dZ9EFyTl0uJXL4kLw5SQOwX/px6Z+utVoCkmp5LfP67galrIncxHfZ1iA5twPK hHEg== 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=PtcTqxpDnDfqsFO7cI3/KlWjnGPuzmGuz8LzcVlQ3VY=; b=V4kyNxQL3xT4pVsm2CtHVUfhIHo8jQHfEPOfQqfEsUCjHewF+vSpKoo4XqAVZLSd+n k5boKxCYrANVR//1FMSkRskOtLe/GBapHPVCf9AfM4SRtnPD0L3wDywZUJV5sfwAVoct lNamROgPj/TNgO0DmkSaYrqGE5jjPce4qvHHxBp6BpxPO+lVT1TUe+jDSVnZ+CExdQeJ P2ncO4Y8q2+84f/hmlz9v1Zd6gePmnKisBl4TwSk8c9BXHC4j3rGbbylgqxmOATHgs7Z Mbz9nRo9vTMd0F1G3DR15tMZOx+3uvuAQi7jK0vkawJ6YjuSfwIt3pumhoLAm8o2Sj4k bJww== X-Gm-Message-State: AOAM530auUUOjadtffLc9152mRDi5xcoPmJCoGH0xcqRiKFB0L7bsdYP LpiFPj4HlIhuPyxjemm7LshtibSOp6pjl+3K X-Google-Smtp-Source: ABdhPJzyE+TciQs6R1VdqdBzQKxABphqJU3jhnJGJ8aN3EI7OdWUnPw4IeKskRXEOWF4j0kvzJJ+ag== X-Received: by 2002:a05:6830:1647:: with SMTP id h7mr3498859otr.281.1604724463709; Fri, 06 Nov 2020 20:47:43 -0800 (PST) Received: from localhost.localdomain ([136.49.44.103]) by smtp.gmail.com with ESMTPSA id x25sm836888oie.17.2020.11.06.20.47.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Nov 2020 20:47:43 -0800 (PST) From: Glenn Washburn To: grub-devel@gnu.org Cc: Patrick Steinhardt , Daniel Kiper , Glenn Washburn Subject: [PATCH v4 08/15] luks2: Split idx into three variables: keyslot_key, digest_key, segment_key. Date: Fri, 6 Nov 2020 22:44:28 -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::344; envelope-from=development@efficientek.com; helo=mail-ot1-x344.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:47 -0000 Introduce new variables keyslot_key, digest_key, and segment_key which represent the integer key of the item in the respective associative array when looping over the array items. This replaces using a generically named variable named "idx" used for all three values. Signed-off-by: Glenn Washburn --- grub-core/disk/luks2.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c index d96764a02..1a4034f28 100644 --- a/grub-core/disk/luks2.c +++ b/grub-core/disk/luks2.c @@ -259,12 +259,12 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_luks2_digest_t *d, grub_luks2_s { grub_json_t keyslots, keyslot, digests, digest, segments, segment; grub_size_t i, size; - grub_uint64_t idx; + grub_uint64_t keyslot_key, digest_key, segment_key; /* Get nth keyslot */ if (grub_json_getvalue (&keyslots, root, "keyslots") || grub_json_getchild (&keyslot, &keyslots, keyslot_idx) || - grub_json_getuint64 (&idx, &keyslot, NULL) || + grub_json_getuint64 (&keyslot_key, &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, keyslot_idx); @@ -276,11 +276,12 @@ 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_getuint64 (&digest_key, &digest, NULL) || 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))) + if ((d->keyslots & (1 << keyslot_key))) break; } if (i == size) @@ -293,12 +294,12 @@ 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 (&segment, &segments, i) || - grub_json_getuint64 (&idx, &segment, NULL) || + grub_json_getuint64 (&segment_key, &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, i); - if ((d->segments & (1 << idx))) + if ((d->segments & (1 << segment_key))) break; } if (i == size) -- 2.27.0