Commit 26e02272 authored by Borislav Petkov's avatar Borislav Petkov Committed by Ricardo Neri
Browse files

efi: Rename efi_guid_unparse to efi_guid_to_str



Call it what it does - "unparse" is plain-misleading.
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarRicardo Neri <ricardo.neri-calderon@linux.intel.com>
parent 0e4ca02b
...@@ -715,7 +715,7 @@ int efi_partition(struct parsed_partitions *state) ...@@ -715,7 +715,7 @@ int efi_partition(struct parsed_partitions *state)
state->parts[i + 1].flags = ADDPART_FLAG_RAID; state->parts[i + 1].flags = ADDPART_FLAG_RAID;
info = &state->parts[i + 1].info; info = &state->parts[i + 1].info;
efi_guid_unparse(&ptes[i].unique_partition_guid, info->uuid); efi_guid_to_str(&ptes[i].unique_partition_guid, info->uuid);
/* Naively convert UTF16-LE to 7 bits. */ /* Naively convert UTF16-LE to 7 bits. */
label_max = min(ARRAY_SIZE(info->volname) - 1, label_max = min(ARRAY_SIZE(info->volname) - 1,
......
...@@ -272,10 +272,10 @@ static __init int match_config_table(efi_guid_t *guid, ...@@ -272,10 +272,10 @@ static __init int match_config_table(efi_guid_t *guid,
int i; int i;
if (table_types) { if (table_types) {
efi_guid_unparse(guid, str); efi_guid_to_str(guid, str);
for (i = 0; efi_guidcmp(table_types[i].guid, NULL_GUID); i++) { for (i = 0; efi_guidcmp(table_types[i].guid, NULL_GUID); i++) {
efi_guid_unparse(&table_types[i].guid, str); efi_guid_to_str(&table_types[i].guid, str);
if (!efi_guidcmp(*guid, table_types[i].guid)) { if (!efi_guidcmp(*guid, table_types[i].guid)) {
*(table_types[i].ptr) = table; *(table_types[i].ptr) = table;
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
* fix locking per Peter Chubb's findings * fix locking per Peter Chubb's findings
* *
* 25 Mar 2002 - Matt Domsch <Matt_Domsch@dell.com> * 25 Mar 2002 - Matt Domsch <Matt_Domsch@dell.com>
* move uuid_unparse() to include/asm-ia64/efi.h:efi_guid_unparse() * move uuid_unparse() to include/asm-ia64/efi.h:efi_guid_to_str()
* *
* 12 Feb 2002 - Matt Domsch <Matt_Domsch@dell.com> * 12 Feb 2002 - Matt Domsch <Matt_Domsch@dell.com>
* use list_for_each_safe when deleting vars. * use list_for_each_safe when deleting vars.
...@@ -128,7 +128,7 @@ efivar_guid_read(struct efivar_entry *entry, char *buf) ...@@ -128,7 +128,7 @@ efivar_guid_read(struct efivar_entry *entry, char *buf)
if (!entry || !buf) if (!entry || !buf)
return 0; return 0;
efi_guid_unparse(&var->VendorGuid, str); efi_guid_to_str(&var->VendorGuid, str);
str += strlen(str); str += strlen(str);
str += sprintf(str, "\n"); str += sprintf(str, "\n");
...@@ -569,7 +569,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var) ...@@ -569,7 +569,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
private variables from another's. */ private variables from another's. */
*(short_name + strlen(short_name)) = '-'; *(short_name + strlen(short_name)) = '-';
efi_guid_unparse(&new_var->var.VendorGuid, efi_guid_to_str(&new_var->var.VendorGuid,
short_name + strlen(short_name)); short_name + strlen(short_name));
new_var->kobj.kset = efivars_kset; new_var->kobj.kset = efivars_kset;
......
...@@ -140,7 +140,7 @@ static int efivarfs_callback(efi_char16_t *name16, efi_guid_t vendor, ...@@ -140,7 +140,7 @@ static int efivarfs_callback(efi_char16_t *name16, efi_guid_t vendor,
name[len] = '-'; name[len] = '-';
efi_guid_unparse(&entry->var.VendorGuid, name + len + 1); efi_guid_to_str(&entry->var.VendorGuid, name + len + 1);
name[len + EFI_VARIABLE_GUID_LEN+1] = '\0'; name[len + EFI_VARIABLE_GUID_LEN+1] = '\0';
......
...@@ -844,7 +844,7 @@ efi_guidcmp (efi_guid_t left, efi_guid_t right) ...@@ -844,7 +844,7 @@ efi_guidcmp (efi_guid_t left, efi_guid_t right)
} }
static inline char * static inline char *
efi_guid_unparse(efi_guid_t *guid, char *out) efi_guid_to_str(efi_guid_t *guid, char *out)
{ {
sprintf(out, "%pUl", guid->b); sprintf(out, "%pUl", guid->b);
return out; return out;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment