diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/strto.c | 11 | ||||
| -rw-r--r-- | lib/uuid.c | 8 |
2 files changed, 16 insertions, 3 deletions
diff --git a/lib/strto.c b/lib/strto.c index 1ac2b09c725..3d77115d4d8 100644 --- a/lib/strto.c +++ b/lib/strto.c @@ -34,6 +34,9 @@ static const char *_parse_integer_fixup_radix(const char *s, unsigned int *base) *base = 16; break; } + + if (!(var >= '0' && var <= '9')) + break; } while (var); } } @@ -176,3 +179,11 @@ long trailing_strtol(const char *str) { return trailing_strtoln(str, NULL); } + +void str_to_upper(const char *in, char *out, size_t len) +{ + for (; len > 0 && *in; len--) + *out++ = toupper(*in++); + if (len) + *out = '\0'; +} diff --git a/lib/uuid.c b/lib/uuid.c index 3d3c7abcaea..c1cb9df6aac 100644 --- a/lib/uuid.c +++ b/lib/uuid.c @@ -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_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; @@ -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}; |