Changes in / [d5a89a3:4805495] in mainline

Location:

uspace

Files:

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

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/casting.c \
         test/fibril/timer.c \
@@ -198 +197 @@
         test/io/table.c \
         test/stdio/scanf.c \
+        test/odict.c \
         test/perf.c \
         test/perm.c \
@@ -205 +205 @@
         test/stdlib.c \
         test/str.c \
-        test/string.c \
-        test/cap.c \
-        test/gsort.c \
-        test/ieee_double.c \
-        test/double_to_str.c \
-        test/getopt.c \
-        test/uuid.c \
-        test/imath.c
+        test/string.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/c/generic/cap.c

@@ -160 +160 @@
 
         /* Round the number so that we have at most @c scap_max_sdig significant digits */
-        rc = ilog10_u64(cap->m, &sdig); /* number of significant digits */
-        sdig += 1;
-        assert(rc == EOK);
+        sdig = 1 + ilog10_u64(cap->m); /* number of significant digits */
         if (sdig > scap_max_sdig) {
                 /* Number of digits to remove */

uspace/lib/c/generic/gsort.c

@@ -33 +33 @@
 /**
  * @file
- * @brief Gnome Sort.
+ * @brief Sorting functions.
  *
- * This file contains an implementation of gnome sort
+ * This files contains functions implementing several sorting
+ * algorithms (e.g. quick sort and gnome sort).
  *
  */
@@ -79 +80 @@
                 if ((i != 0) &&
                     (cmp(INDEX(data, i, elem_size),
-                    INDEX(data, i - 1, elem_size), arg) <= -1)) {
+                    INDEX(data, i - 1, elem_size), arg) == -1)) {
                         memcpy(slot, INDEX(data, i, elem_size), elem_size);
                         memcpy(INDEX(data, i, elem_size), INDEX(data, i - 1, elem_size),

uspace/lib/c/generic/ieee_double.c

@@ -92 +92 @@
                 if (ret.is_denormal) {
                         ret.pos_val.significand = raw_significand;
-                        if (raw_significand == 0) {
-                                ret.pos_val.exponent = -exponent_bias;
-                        } else {
-                                ret.pos_val.exponent = 1 - exponent_bias;
-                        }
-
+                        ret.pos_val.exponent = 1 - exponent_bias;
                         ret.is_accuracy_step = false;
                 } else {

uspace/lib/c/generic/imath.c

@@ -50 +50 @@
 errno_t ipow10_u64(unsigned exp, uint64_t *res)
 {
-        uint64_t a;
+        unsigned a;
         uint64_t r;
 
@@ -81 +81 @@
  *
  * @param v Value to compute logarithm from
- * @param res Place to store result
- * @return EOK on success
  * @return Logarithm value
  */
-errno_t ilog10_u64(uint64_t v, unsigned *res)
+unsigned ilog10_u64(uint64_t v)
 {
-        if (v == 0)
-                return ERANGE;
-
         unsigned b;
         unsigned e;
@@ -122 +117 @@
         }
 
-        *res = r;
-        return EOK;
+        return r;
 }
 

uspace/lib/c/generic/string.c

@@ -565 +565 @@
         }
 
-        strncpy(dup, s, sz);
+        strcpy(dup, s);
         return dup;
 }

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;
 }
 

uspace/lib/c/include/imath.h

@@ -40 +40 @@
 
 extern errno_t ipow10_u64(unsigned, uint64_t *);
-extern errno_t ilog10_u64(uint64_t, unsigned *);
+extern unsigned ilog10_u64(uint64_t);
 
 #endif

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 *);
@@ -44 +43 @@
 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 **, bool);
+extern errno_t uuid_format(uuid_t *, char **);
 
 #endif

uspace/lib/c/test/main.c

@@ -48 +48 @@
 PCUT_IMPORT(string);
 PCUT_IMPORT(table);
-PCUT_IMPORT(cap);
-PCUT_IMPORT(gsort);
-PCUT_IMPORT(ieee_double);
-PCUT_IMPORT(double_to_str);
-PCUT_IMPORT(getopt);
-PCUT_IMPORT(uuid);
-PCUT_IMPORT(imath);
 
 PCUT_MAIN();