diff mbox series

[v5,4/6] uuid: Use const char * where possible

Message ID 20200408083251.v5.4.I6c2cc3ee6daf9e48e3b5dc49d5386f9c0bca2a4a@changeid
State Accepted
Commit 2c2ca207e4ed7def3f3f33ab930e673a45bb3743
Headers show
Series A few little patches | expand

Commit Message

Simon Glass April 8, 2020, 2:32 p.m. UTC 
Update the arguments of these functions so they can be called from code
which uses constant strings.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

Changes in v5: None
Changes in v4: None

 include/uuid.h | 8 +++++---
 lib/uuid.c     | 6 ++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

Comments

Tom Rini April 26, 2020, 11:26 a.m. UTC | #1 
On Wed, Apr 08, 2020 at 08:32:58AM -0600, Simon Glass wrote:

> Update the arguments of these functions so they can be called from code
> which uses constant strings.
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/include/uuid.h b/include/uuid.h
index abcc325eae9..73c5a89ec7c 100644
--- a/include/uuid.h
+++ b/include/uuid.h
@@ -35,11 +35,13 @@  struct uuid {
 #define UUID_VARIANT		0x1
 
 int uuid_str_valid(const char *uuid);
-int uuid_str_to_bin(char *uuid_str, unsigned char *uuid_bin, int str_format);
-void uuid_bin_to_str(unsigned char *uuid_bin, char *uuid_str, int str_format);
+int uuid_str_to_bin(const char *uuid_str, unsigned char *uuid_bin,
+		    int str_format);
+void uuid_bin_to_str(const unsigned char *uuid_bin, char *uuid_str,
+		     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_str(unsigned char *guid_bin, char *guid_str);
+int uuid_guid_get_str(const unsigned char *guid_bin, char *guid_str);
 #endif
 void gen_rand_uuid(unsigned char *uuid_bin);
 void gen_rand_uuid_str(char *uuid_str, int str_format);
diff --git a/lib/uuid.c b/lib/uuid.c
index 3d3c7abcaea..03edaf8b6cf 100644
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -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]
  * @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;
 	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
  *			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,
 						  9, 10, 11, 12, 13, 14, 15};