Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-22 04:44:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

uuid: Use const char * where possible

Browse source 
Update the arguments of these functions so they can be called from code
which uses constant strings.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2020-04-08 08:32:58 -06:00 • committed by Tom Rini
parent fdc79a6b12
commit 2c2ca207e4
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/uuid.h
View file

@ -35,11 +35,13 @@ struct uuid {
#define UUID_VARIANT 0x1 #define UUID_VARIANT 0x1
int uuid_str_valid(const char *uuid); int uuid_str_valid(const char *uuid);
int uuid_str_to_bin(char *uuid_str, unsigned char *uuid_bin, int str_format); int uuid_str_to_bin(const char *uuid_str, unsigned char *uuid_bin,
void uuid_bin_to_str(unsigned char *uuid_bin, char *uuid_str, int str_format); int str_format);
void uuid_bin_to_str(const unsigned char *uuid_bin, char *uuid_str,
int str_format);
#ifdef CONFIG_PARTITION_TYPE_GUID #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(unsigned char *guid_bin, char *guid_str); int uuid_guid_get_str(const unsigned char *guid_bin, char *guid_str);
#endif #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);

8
lib/uuid.c
View file

@ -121,7 +121,7 @@ int uuid_guid_get_bin(const char *guid_str, unsigned char *guid_bin)
* @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] * @param guid_str - pointer to allocated partition type string [7B]
*/ */
int uuid_guid_get_str(unsigned char *guid_bin, char *guid_str) int uuid_guid_get_str(const unsigned char *guid_bin, char *guid_str)
{ {
int i; int i;
@ -143,7 +143,8 @@ int uuid_guid_get_str(unsigned char *guid_bin, char *guid_str)
* @param uuid_bin - pointer to allocated array for big endian output [16B] * @param uuid_bin - pointer to allocated array for big endian output [16B]
* @str_format - UUID string format: 0 - UUID; 1 - GUID * @str_format - UUID string format: 0 - UUID; 1 - GUID
*/ */
int uuid_str_to_bin(char *uuid_str, unsigned char *uuid_bin, int str_format) int uuid_str_to_bin(const char *uuid_str, unsigned char *uuid_bin,
int str_format)
{ {
uint16_t tmp16; uint16_t tmp16;
uint32_t tmp32; uint32_t tmp32;
@ -194,7 +195,8 @@ int uuid_str_to_bin(char *uuid_str, unsigned char *uuid_bin, int str_format)
* @str_format: bit 0: 0 - UUID; 1 - GUID * @str_format: bit 0: 0 - UUID; 1 - GUID
* bit 1: 0 - lower case; 2 - upper case * bit 1: 0 - lower case; 2 - upper case
*/ */
void uuid_bin_to_str(unsigned char *uuid_bin, char *uuid_str, int str_format) void uuid_bin_to_str(const unsigned char *uuid_bin, char *uuid_str,
int str_format)
{ {
const u8 uuid_char_order[UUID_BIN_LEN] = {0, 1, 2, 3, 4, 5, 6, 7, 8, const u8 uuid_char_order[UUID_BIN_LEN] = {0, 1, 2, 3, 4, 5, 6, 7, 8,
9, 10, 11, 12, 13, 14, 15}; 9, 10, 11, 12, 13, 14, 15};