Changeset 6c707e4 in mainline

Timestamp:

2019-02-18T17:03:03Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b2dca036

Parents:

ab7d85a

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-09 18:31:41)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-18 17:03:03)

Message:

Add an implementation of uuid_format

Location:

uspace/lib/c

Files:

• generic/uuid.c (modified) (2 diffs)
• include/uuid.h (modified) (2 diffs)

uspace/lib/c/generic/uuid.c

@@ -39 +39 @@
 #include <stddef.h>
 #include <str.h>
+#include <stdio.h>
 
 /** Generate UUID.
@@ -176 +177 @@
  * @return EOK on success, ENOMEM if out of memory
  */
-errno_t uuid_format(uuid_t *uuid, char **rstr)
-{
-        return ENOTSUP;
+errno_t uuid_format(uuid_t *uuid, char **rstr, bool uppercase)
+{
+        size_t size = 37;
+        char *str = malloc(sizeof(char) * size);
+        if (str == NULL)
+                return ENOMEM;
+
+        const char *format = "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x";
+        if (uppercase)
+                format = "%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X";
+
+        int ret = snprintf(str, size, format, uuid->b[0], uuid->b[1], uuid->b[2], uuid->b[3], uuid->b[4], uuid->b[5], uuid->b[6], uuid->b[7], uuid->b[8], uuid->b[9], uuid->b[10], uuid->b[11], uuid->b[12], uuid->b[13], uuid->b[14], uuid->b[15]);
+
+        if (ret != 36)
+                return EINVAL;
+
+        *rstr = str;
+        return EOK;
 }
 

uspace/lib/c/include/uuid.h

@@ -38 +38 @@
 #include <stdint.h>
 #include <types/uuid.h>
+#include <stdbool.h>
 
 extern errno_t uuid_generate(uuid_t *);
@@ -43 +44 @@
 extern void uuid_decode(uint8_t *, uuid_t *);
 extern errno_t uuid_parse(const char *, uuid_t *, const char **);
-extern errno_t uuid_format(uuid_t *, char **);
+extern errno_t uuid_format(uuid_t *, char **, bool);
 
 #endif