From: Jakob Koschel <jakobkoschel@gmail.com>
To: Ard Biesheuvel <ardb@kernel.org>
Cc: linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org,
Mike Rapoport <rppt@kernel.org>,
"Brian Johannesmeyer" <bjohannesmeyer@gmail.com>,
Cristiano Giuffrida <c.giuffrida@vu.nl>,
"Bos, H.J." <h.j.bos@vu.nl>,
Jakob Koschel <jakobkoschel@gmail.com>
Subject: [PATCH 2/2] efi: replace usage of found with dedicated list iterator variable
Date: Fri, 1 Apr 2022 00:10:30 +0200 [thread overview]
Message-ID: <20220331221030.889718-2-jakobkoschel@gmail.com> (raw)
In-Reply-To: <20220331221030.889718-1-jakobkoschel@gmail.com>
To move the list iterator variable into the list_for_each_entry_*()
macro in the future it should be avoided to use the list iterator
variable after the loop body.
To *never* use the list iterator variable after the loop it was
concluded to use a separate iterator variable instead of a
found boolean [1].
This removes the need to use a found variable and simply checking if
the variable was set, can determine if the break/goto was hit.
Link: https://lore.kernel.org/all/CAHk-=wgRr_D8CB-D9Kg-c=EHreAsk5SqXPwr9Y7k9sA6cWXJ6w@mail.gmail.com/
Signed-off-by: Jakob Koschel <jakobkoschel@gmail.com>
---
drivers/firmware/efi/vars.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/firmware/efi/vars.c b/drivers/firmware/efi/vars.c
index 3994aad38661..e4e1cc593441 100644
--- a/drivers/firmware/efi/vars.c
+++ b/drivers/firmware/efi/vars.c
@@ -809,22 +809,21 @@ EXPORT_SYMBOL_GPL(efivar_entry_set_safe);
struct efivar_entry *efivar_entry_find(efi_char16_t *name, efi_guid_t guid,
struct list_head *head, bool remove)
{
- struct efivar_entry *entry, *n;
+ struct efivar_entry *entry = NULL, *iter, *n;
int strsize1, strsize2;
- bool found = false;
- list_for_each_entry_safe(entry, n, head, list) {
+ list_for_each_entry_safe(iter, n, head, list) {
strsize1 = ucs2_strsize(name, 1024);
- strsize2 = ucs2_strsize(entry->var.VariableName, 1024);
+ strsize2 = ucs2_strsize(iter->var.VariableName, 1024);
if (strsize1 == strsize2 &&
- !memcmp(name, &(entry->var.VariableName), strsize1) &&
- !efi_guidcmp(guid, entry->var.VendorGuid)) {
- found = true;
+ !memcmp(name, &(iter->var.VariableName), strsize1) &&
+ !efi_guidcmp(guid, iter->var.VendorGuid)) {
+ entry = iter;
break;
}
}
- if (!found)
+ if (!entry)
return NULL;
if (remove) {
--
2.25.1
next prev parent reply other threads:[~2022-03-31 22:11 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-31 22:10 [PATCH 1/2] efi: remove use of list iterator variable after loop Jakob Koschel
2022-03-31 22:10 ` Jakob Koschel [this message]
2022-04-13 17:09 ` [PATCH 2/2] efi: replace usage of found with dedicated list iterator variable Ard Biesheuvel
2022-04-13 17:05 ` [PATCH 1/2] efi: remove use of list iterator variable after loop Ard Biesheuvel
2022-04-13 18:08 ` Jakob Koschel
2022-04-13 22:09 ` Ard Biesheuvel
2022-06-28 8:02 ` Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220331221030.889718-2-jakobkoschel@gmail.com \
--to=jakobkoschel@gmail.com \
--cc=ardb@kernel.org \
--cc=bjohannesmeyer@gmail.com \
--cc=c.giuffrida@vu.nl \
--cc=h.j.bos@vu.nl \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rppt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®