Changes in uspace/lib/c/generic/uuid.c [f52ce72:09ab0a9a] in mainline

File:

• uspace/lib/c/generic/uuid.c (modified) (4 diffs)

uspace/lib/c/generic/uuid.c

@@ -39 +39 @@
 #include <stddef.h>
 #include <str.h>
-#include <stdio.h>
 
 /** Generate UUID.
@@ -65 +64 @@
 
         /* Version 4 UUID from random or pseudo-random numbers */
-        uuid->b[6] = (uuid->b[6] & 0x4F) | 0x40;
-        uuid->b[8] = (uuid->b[8] & 0xBF) | 0xB0;
-        
-        rc = EOK;
+        uuid->b[8] = (uuid->b[8] & ~0xc0) | 0x40;
+        uuid->b[6] = (uuid->b[6] & 0xf0) | 0x40;
+
+        return EOK;
 error:
         rndgen_destroy(rndgen);
@@ -140 +139 @@
 
         rc = str_uint64_t(str + 24, &eptr, 16, false, &node);
-        if (rc != EOK || eptr != str + 36)
+        if (rc != EOK || eptr != str + 36 || *eptr != '\0')
                 return EINVAL;
 
@@ -177 +176 @@
  * @return EOK on success, ENOMEM if out of memory
  */
-errno_t uuid_format(uuid_t *uuid, char **rstr, bool uppercase)
+errno_t uuid_format(uuid_t *uuid, char **rstr)
 {
-        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;
+        return ENOTSUP;
 }