Changeset bc417660 in mainline

Timestamp:

2019-02-23T16:28:16Z (5 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:

ab87db5

Parents:

098e16a5 (diff), 76ec309b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge pcut tests and corrections by matthieuriolo

Location:

uspace

Files:

• app/df/df.c (modified) (2 diffs)
• lib/c/Makefile (modified) (1 diff)
• lib/c/generic/gsort.c (modified) (1 diff)
• lib/c/generic/imath.c (modified) (1 diff)
• lib/c/generic/uuid.c (modified) (4 diffs)
• lib/c/include/uuid.h (modified) (2 diffs)
• lib/c/test/adt/odict.c (moved) (moved from uspace/lib/c/test/odict.c )
• lib/c/test/cap.c (added)
• lib/c/test/double_to_str.c (added)
• lib/c/test/getopt.c (added)
• lib/c/test/gsort.c (added)
• lib/c/test/ieee_double.c (added)
• lib/c/test/imath.c (added)
• lib/c/test/main.c (modified) (2 diffs)
• lib/c/test/uuid.c (added)

uspace/app/df/df.c

@@ -70 +70 @@
 
         /* Parse command-line options */
-        while ((optres = getopt(argc, argv, ":ubh")) != -1) {
+        while ((optres = getopt(argc, argv, "ubh")) != -1) {
                 switch (optres) {
                 case 'h':
@@ -78 +78 @@
                 case 'b':
                         display_blocks = true;
-                        break;
-
-                case ':':
-                        fprintf(stderr, "Option -%c requires an operand\n",
-                            optopt);
-                        errflg++;
                         break;
 

uspace/lib/c/Makefile

@@ -190 +190 @@
 TEST_SOURCES = \
         test/adt/circ_buf.c \
+        test/adt/odict.c \
+        test/cap.c \
         test/casting.c \
+        test/double_to_str.c \
         test/fibril/timer.c \
+        test/getopt.c \
+        test/gsort.c \
+        test/ieee_double.c \
+        test/imath.c \
+        test/inttypes.c \
+        test/io/table.c \
         test/main.c \
         test/mem.c \
-        test/inttypes.c \
-        test/io/table.c \
-        test/stdio/scanf.c \
-        test/odict.c \
         test/perf.c \
         test/perm.c \
         test/qsort.c \
         test/sprintf.c \
+        test/stdio/scanf.c \
         test/stdio.c \
         test/stdlib.c \
         test/str.c \
-        test/string.c
+        test/string.c \
+        test/uuid.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/c/generic/gsort.c

@@ -33 +33 @@
 /**
  * @file
- * @brief Sorting functions.
+ * @brief Gnome Sort.
  *
- * This files contains functions implementing several sorting
- * algorithms (e.g. quick sort and gnome sort).
+ * This file contains an implementation of gnome sort
  *
  */

uspace/lib/c/generic/imath.c

@@ -50 +50 @@
 errno_t ipow10_u64(unsigned exp, uint64_t *res)
 {
-        unsigned a;
+        uint64_t a;
         uint64_t r;
 

uspace/lib/c/generic/uuid.c

@@ -39 +39 @@
 #include <stddef.h>
 #include <str.h>
+#include <stdio.h>
 
 /** Generate UUID.
@@ -67 +68 @@
         uuid->b[8] = (uuid->b[8] & 0x3f) | 0x80;
 
-        return EOK;
 error:
         rndgen_destroy(rndgen);
@@ -139 +139 @@
 
         rc = str_uint64_t(str + 24, &eptr, 16, false, &node);
-        if (rc != EOK || eptr != str + 36 || *eptr != '\0')
+        if (rc != EOK || eptr != str + 36)
                 return EINVAL;
 
@@ -176 +176 @@
  * @return EOK on success, ENOMEM if out of memory
  */
-errno_t uuid_format(uuid_t *uuid, char **rstr)
+errno_t uuid_format(uuid_t *uuid, char **rstr, bool uppercase)
 {
-        return ENOTSUP;
+        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

uspace/lib/c/test/main.c

@@ -32 +32 @@
 PCUT_INIT;
 
+PCUT_IMPORT(cap);
 PCUT_IMPORT(casting);
 PCUT_IMPORT(circ_buf);
+PCUT_IMPORT(double_to_str);
 PCUT_IMPORT(fibril_timer);
+PCUT_IMPORT(getopt);
+PCUT_IMPORT(gsort);
+PCUT_IMPORT(ieee_double);
+PCUT_IMPORT(imath);
 PCUT_IMPORT(inttypes);
 PCUT_IMPORT(mem);
@@ -48 +54 @@
 PCUT_IMPORT(string);
 PCUT_IMPORT(table);
+PCUT_IMPORT(uuid);
 
 PCUT_MAIN();