Changeset 810a36f in mainline for uspace/lib/c/generic

Timestamp:

2017-10-24T05:29:08Z (8 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

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

Children:

b1eb7ef

Parents:

c8fbbe7 (diff), 673ea28 (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 branch 'types'.

Location:

uspace/lib/c/generic

Files:

• double_to_str.c (modified) (1 diff)
• gsort.c (modified) (1 diff)
• inet/addr.c (modified) (1 diff)
• io/printf_core.c (modified) (4 diffs)
• str.c (modified) (1 diff)

uspace/lib/c/generic/double_to_str.c

@@ -32 +32 @@
 #include <ieee_double.h>
 
+#include <limits.h>
 #include <stdint.h>
 #include <stdbool.h>

uspace/lib/c/generic/gsort.c

@@ -41 +41 @@
 
 #include <gsort.h>
+#include <inttypes.h>
 #include <mem.h>
 #include <malloc.h>

uspace/lib/c/generic/inet/addr.c

@@ -41 +41 @@
 #include <malloc.h>
 #include <bitops.h>
+#include <inttypes.h>
 
 #define INET_PREFIXSTRSIZE  5

uspace/lib/c/generic/io/printf_core.c

@@ -46 +46 @@
 #include <assert.h>
 #include <macros.h>
+#include <wchar.h>
 
 
@@ -114 +115 @@
         PrintfQualifierLongLong,
         PrintfQualifierPointer,
-        PrintfQualifierSize
+        PrintfQualifierSize,
+        PrintfQualifierMax
 } qualifier_t;
 
@@ -1484 +1486 @@
                                 uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
                                 break;
+                        case 'j':
+                                qualifier = PrintfQualifierMax;
+                                i = nxt;
+                                uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
+                                break;
                         default:
                                 /* Default type */
@@ -1629 +1636 @@
                                 number = (uint64_t) va_arg(ap, size_t);
                                 break;
+                        case PrintfQualifierMax:
+                                size = sizeof(uintmax_t);
+                                number = (uint64_t) va_arg(ap, uintmax_t);
+                                break;
                         default:
                                 /* Unknown qualifier */

uspace/lib/c/generic/str.c

@@ -46 +46 @@
 #include <align.h>
 #include <mem.h>
+#include <limits.h>
 
 /** Check the condition if wchar_t is signed */
-#ifdef WCHAR_IS_UNSIGNED
+#ifdef __WCHAR_UNSIGNED__
         #define WCHAR_SIGNED_CHECK(cond)  (true)
 #else