mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-06-09 23:36:03 +09:00
lib/uuid.c: change prototype of uuid_guid_get_str()
There's no reason to require an appropriately sized output parameter for the string, that's error-prone should the table ever grow an element with a longer string. We can just return the const char* pointer directly. Update the only caller accordingly, and get rid of pointless ifdeffery in the header so that the compiler always sees a declaration and can thus do type-checking, whether or not PARTITION_TYPE_GUID is enabled or not. Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
This commit is contained in:
parent
2d572ede11
commit
31ce367cd1
|
@ -247,10 +247,11 @@ void part_print_efi(struct blk_desc *dev_desc)
|
||||||
uuid_bin = (unsigned char *)gpt_pte[i].partition_type_guid.b;
|
uuid_bin = (unsigned char *)gpt_pte[i].partition_type_guid.b;
|
||||||
uuid_bin_to_str(uuid_bin, uuid, UUID_STR_FORMAT_GUID);
|
uuid_bin_to_str(uuid_bin, uuid, UUID_STR_FORMAT_GUID);
|
||||||
printf("\ttype:\t%s\n", uuid);
|
printf("\ttype:\t%s\n", uuid);
|
||||||
#ifdef CONFIG_PARTITION_TYPE_GUID
|
if (CONFIG_IS_ENABLED(PARTITION_TYPE_GUID)) {
|
||||||
if (!uuid_guid_get_str(uuid_bin, uuid))
|
const char *type = uuid_guid_get_str(uuid_bin);
|
||||||
printf("\ttype:\t%s\n", uuid);
|
if (type)
|
||||||
#endif
|
printf("\ttype:\t%s\n", type);
|
||||||
|
}
|
||||||
uuid_bin = (unsigned char *)gpt_pte[i].unique_partition_guid.b;
|
uuid_bin = (unsigned char *)gpt_pte[i].unique_partition_guid.b;
|
||||||
uuid_bin_to_str(uuid_bin, uuid, UUID_STR_FORMAT_GUID);
|
uuid_bin_to_str(uuid_bin, uuid, UUID_STR_FORMAT_GUID);
|
||||||
printf("\tguid:\t%s\n", uuid);
|
printf("\tguid:\t%s\n", uuid);
|
||||||
|
|
|
@ -39,10 +39,8 @@ int uuid_str_to_bin(const char *uuid_str, unsigned char *uuid_bin,
|
||||||
int str_format);
|
int str_format);
|
||||||
void uuid_bin_to_str(const unsigned char *uuid_bin, char *uuid_str,
|
void uuid_bin_to_str(const unsigned char *uuid_bin, char *uuid_str,
|
||||||
int str_format);
|
int str_format);
|
||||||
#ifdef CONFIG_PARTITION_TYPE_GUID
|
|
||||||
int uuid_guid_get_bin(const char *guid_str, unsigned char *guid_bin);
|
int uuid_guid_get_bin(const char *guid_str, unsigned char *guid_bin);
|
||||||
int uuid_guid_get_str(const unsigned char *guid_bin, char *guid_str);
|
const char *uuid_guid_get_str(const unsigned char *guid_bin);
|
||||||
#endif
|
|
||||||
void gen_rand_uuid(unsigned char *uuid_bin);
|
void gen_rand_uuid(unsigned char *uuid_bin);
|
||||||
void gen_rand_uuid_str(char *uuid_str, int str_format);
|
void gen_rand_uuid_str(char *uuid_str, int str_format);
|
||||||
#endif
|
#endif
|
||||||
|
|
11
lib/uuid.c
11
lib/uuid.c
|
@ -122,20 +122,19 @@ int uuid_guid_get_bin(const char *guid_str, unsigned char *guid_bin)
|
||||||
* uuid_guid_get_str() - this function get string for GUID.
|
* uuid_guid_get_str() - this function get string for GUID.
|
||||||
*
|
*
|
||||||
* @param guid_bin - pointer to string with partition type guid [16B]
|
* @param guid_bin - pointer to string with partition type guid [16B]
|
||||||
* @param guid_str - pointer to allocated partition type string [7B]
|
*
|
||||||
|
* Returns NULL if the type GUID is not known.
|
||||||
*/
|
*/
|
||||||
int uuid_guid_get_str(const unsigned char *guid_bin, char *guid_str)
|
const char *uuid_guid_get_str(const unsigned char *guid_bin)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
*guid_str = 0;
|
|
||||||
for (i = 0; i < ARRAY_SIZE(list_guid); i++) {
|
for (i = 0; i < ARRAY_SIZE(list_guid); i++) {
|
||||||
if (!memcmp(list_guid[i].guid.b, guid_bin, 16)) {
|
if (!memcmp(list_guid[i].guid.b, guid_bin, 16)) {
|
||||||
strcpy(guid_str, list_guid[i].string);
|
return list_guid[i].string;
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return -ENODEV;
|
return NULL;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user