leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmd: efidebug: simplify get_guid_text()

Browse Source 
When we hit a matching GUID we can directly return the text. There is no
need for a check after the loop.

efi_guid_t is defined as 8 byte aligned but GUIDs in packed structures do
not follow this alignment. Do not require the argument of get_guid_text()
to be correctly aligned.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Heinrich Schuchardt 2020-01-07 06:02:33 +01:00
parent 7b31efc54c
commit 173cd9e73a
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cmd/efidebug.c
View File

@ -254,24 +254,27 @@ static const struct {
}; };
/** /**
* get_guid_text - get string of protocol guid * get_guid_text - get string of GUID
* @guid: Protocol guid
* Return: String
* *
* Return string for display to represent the protocol. * Return description of GUID.
*
* @guid: GUID
* Return: description of GUID or NULL
*/ */
static const char *get_guid_text(const efi_guid_t *guid) static const char *get_guid_text(const void *guid)
{ {
int i; int i;
for (i = 0; i < ARRAY_SIZE(guid_list); i++) for (i = 0; i < ARRAY_SIZE(guid_list); i++) {
/*
* As guidcmp uses memcmp() we can safely accept unaligned
* GUIDs.
*/
if (!guidcmp(&guid_list[i].guid, guid)) if (!guidcmp(&guid_list[i].guid, guid))
break; return guid_list[i].text;
}
if (i != ARRAY_SIZE(guid_list)) return NULL;
return guid_list[i].text;
else
return NULL;
} }
/** /**