From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1keEaH-0002NG-GT for mharc-grub-devel@gnu.org; Sun, 15 Nov 2020 04:44:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1keEaF-0002La-JS for grub-devel@gnu.org; Sun, 15 Nov 2020 04:44:31 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:59715) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1keEaD-0002E4-Vg for grub-devel@gnu.org; Sun, 15 Nov 2020 04:44:31 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 786C45C0118; Sun, 15 Nov 2020 04:44:29 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sun, 15 Nov 2020 04:44:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=date :from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm2; bh=/+qVPTHJPlxJ3xeDQcU/ZG3Im5n i1ACJirlE9fEkKis=; b=NPDKOyxX9nr/VJuAk28oQj+eufYAtRRyX/jzHNmAkjP 8PW8V3tf+nZ/0UxtthpxngCKzI9qTv3RHqPp4NMGjDmRcNkXU+47BXpG1wIhxZre mOzX06yerp4hlRgvZTwoDaewcK6IcFBswYZ4x57hj6e6AZbGD3Boz0jbHh1ZXF6X MZGoU9UfAbXzgNl4zr9y1/gaGuNS1rPTUIOBe5eWq3SGLdeJ0vdUySHMoa8ht9qe Ecy/dB9mn+i1jithlvyW4Csa6eXCWtj14kxmE+kJu0258gg64285OpYGAdYYciSX qm27QfJ2EZaQPfx7lD6wbtHT2YJzUhr4/GsKCWPWMqA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=/+qVPT HJPlxJ3xeDQcU/ZG3Im5ni1ACJirlE9fEkKis=; b=chUhnY0E8f+FgM7Zu458nI uwBkwkBUI70JFHk4w1fIy0sSBjYcaPfbPiD40CxKP8nIEZdy8FH+6mVkm/TOEBRD rWKZaSsYneFZ/Fj3hsLcd1Pn1cQIE2mklJEj8WrIqOpjOylWpSl2AugTiUgFltCj xCREU8jI7dZtGiqNteWCNBO6OzWh60XjfVKV68Lqknumf4e3Zb/pch8IGRg162ID sQLXR85LR172qqsUztAO7CDDmVu6om0nwcJu7arN4YIgzQsThFRsavY9/70V+b1z He311LF0sWIhqa8q27qSuc8s0guv6uXiuVkGXfdZZd6HRfo6f0H1jcrOaPH1NnGw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedruddvledgtdekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrh hnpeehgefhtdefueffheekgfffudelffejtdfhvdejkedthfehvdelgfetgfdvtedthfen ucfkphepjeekrdehgedrvddurddvtdeinecuvehluhhsthgvrhfuihiivgepfeenucfrrg hrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh X-ME-Proxy: Received: from vm-mail.pks.im (dynamic-078-054-021-206.78.54.pool.telefonica.de [78.54.21.206]) by mail.messagingengine.com (Postfix) with ESMTPA id C384B3064AA7; Sun, 15 Nov 2020 04:44:28 -0500 (EST) Received: from localhost (ncase [10.192.0.11]) by vm-mail.pks.im (OpenSMTPD) with ESMTPSA id 9a8643d5 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 15 Nov 2020 09:44:27 +0000 (UTC) Date: Sun, 15 Nov 2020 10:44:26 +0100 From: Patrick Steinhardt To: Glenn Washburn Cc: grub-devel@gnu.org, Daniel Kiper Subject: Re: [PATCH v4 07/15] luks2: Rename index variable j to i. Message-ID: References: <21a3962b91508d1a0df568001fb04793ee13f841.1604723348.git.development@efficientek.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="wXAqolopNYjYfvOO" Content-Disposition: inline In-Reply-To: <21a3962b91508d1a0df568001fb04793ee13f841.1604723348.git.development@efficientek.com> Received-SPF: pass client-ip=66.111.4.27; envelope-from=ps@pks.im; helo=out3-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/15 04:37:28 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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: Sun, 15 Nov 2020 09:44:31 -0000 --wXAqolopNYjYfvOO Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Nov 06, 2020 at 10:44:27PM -0600, Glenn Washburn wrote: > 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. >=20 > Signed-off-by: Glenn Washburn Reviewed-by: Patrick Steinhardt > --- > grub-core/disk/luks2.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) >=20 > 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_luks= 2_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; > =20 > /* Get nth keyslot */ > @@ -273,35 +273,35 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_lu= ks2_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 =3D 0; j < size; j++) > + for (i =3D 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 %"PRI= uGRUB_SIZE, j); > + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse digest %"PRI= uGRUB_SIZE, i); > =20 > if ((d->keyslots & (1 << idx))) > break; > } > - if (j =3D=3D size) > + if (i =3D=3D size) > return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No digest for keyslot= %"PRIuGRUB_SIZE, keyslot_idx); > =20 > /* 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 =3D 0; j < size; j++) > + for (i =3D 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 %"PR= IuGRUB_SIZE, j); > + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse segment %"PR= IuGRUB_SIZE, i); > =20 > if ((d->segments & (1 << idx))) > break; > } > - if (j =3D=3D size) > + if (i =3D=3D size) > return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No segment for digest %= "PRIuGRUB_SIZE); > =20 > return GRUB_ERR_NONE; > --=20 > 2.27.0 >=20 --wXAqolopNYjYfvOO Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl+w+HkACgkQVbJhu7ck PpQi8Q//XQbRk/KFqraujjWvc9o2drTb7zWyGWj3GDi13EGoBHWeoSQpU5tY/Li7 pRG4SvZRUiRzfobArOIzA7thtfZ/Zt1P5def3uC08dmGyE/rASxuA7mLJQAbE3/H 1d1lJl4mlu3Cba8wJsuf9s81SXngwNjOyD7Lx6rmsT3yIVsXwgdCudENDa/J2KhU dNs1Jz0xCNWRSkPzhMoNEoHUkdRr8MAxppbznIUg+QqhNRi8wstPAvc6A6EqTY6E ncRx4kNyf4ZhbkJZpc6h9jwpabHJ6rA1P/18wmOte6xRZKTkrxignnaxQv+lTsg/ bKMY1vQgdq2DP0ZwcJ/fiGWV0WX+GDXVAmIX2A085sZqFun7AlsemOfNYU8zWwrZ 71u+W5upeRprJfUoCC72+FWRlNKeG+8nOHPOYvYUMT22GmZ3YFarYVjdlQo8NUgV uwVYEb6bYSzYhu7Tp2rR5gugIbYMZFotMzItualzPRUNXR2Zl8zBSvfDHZ3oPmBn OAsASPGp3f9YXtKLPqEXFm6Ca9EBJFS1Ihm4h/ShNOsb+jspZxXNTyFVyBsM+HXk JCu1aB96IQoPSx0YXGyFiuBoBOG6zFEue2rJX7mUSA27mi0dX4mrqZ2V87QWpRyl fqpVcE3HBruTPugR/uJUilXmcKEjTiztbhwM6whZ8H/vV/jrfm8= =mKCr -----END PGP SIGNATURE----- --wXAqolopNYjYfvOO--