efi: Rename efi_guid_unparse to efi_guid_to_str (26e02272) · Commits · 戴 / test

block/partitions/efi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -715,7 +715,7 @@ int efi_partition(struct parsed_partitions *state)
		state->parts[i + 1].flags = ADDPART_FLAG_RAID;

		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. */
		label_max = min(ARRAY_SIZE(info->volname) - 1,

+2 −2

Original line number	Diff line number	Diff line
		@@ -272,10 +272,10 @@ static __init int match_config_table(efi_guid_t *guid,
		int i;

		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++) {
		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)) {
		*(table_types[i].ptr) = table;

+3 −3

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@
		* fix locking per Peter Chubb's findings
		*
		* 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>
		* use list_for_each_safe when deleting vars.
		@@ -128,7 +128,7 @@ efivar_guid_read(struct efivar_entry entry, char buf)
		if (!entry \|\| !buf)
		return 0;

		efi_guid_unparse(&var->VendorGuid, str);
		efi_guid_to_str(&var->VendorGuid, str);
		str += strlen(str);
		str += sprintf(str, "\n");

		@@ -569,7 +569,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
		private variables from another's. */

		*(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));

		new_var->kobj.kset = efivars_kset;

+1 −1

Original line number	Diff line number	Diff line
		@@ -140,7 +140,7 @@ static int efivarfs_callback(efi_char16_t *name16, efi_guid_t vendor,

		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';

+1 −1

Original line number	Diff line number	Diff line
		@@ -844,7 +844,7 @@ efi_guidcmp (efi_guid_t left, efi_guid_t right)
		}

		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);
		return out;