Changeset 9675296 in mainline

Timestamp:

2019-07-04T13:00:35Z (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:

53afa639

Parents:

98c4c16

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-07-04 12:49:24)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-07-04 13:00:35)

Message:

Some clang fixes

Files:

• abi/include/abi/cap.h (modified) (2 diffs)
• kernel/generic/src/cap/cap.c (modified) (1 diff)
• kernel/generic/src/lib/strtol.c (modified) (1 diff)
• uspace/lib/cpp/include/cstddef (modified) (1 diff)

abi/include/abi/cap.h

@@ -39 +39 @@
 #include <stdint.h>
 
-enum {
-        CAP_NIL = 0,
-};
-
 typedef void *cap_handle_t;
 
@@ -56 +52 @@
 typedef struct {
 } *cap_waitq_handle_t;
+
+static cap_handle_t const CAP_NIL = 0;
 
 static inline bool cap_handle_valid(cap_handle_t handle)

kernel/generic/src/cap/cap.c

@@ -88 +88 @@
 #include <stdlib.h>
 
-#define CAPS_START      (CAP_NIL + 1)
-#define CAPS_SIZE       (INT_MAX - CAPS_START)
+#define CAPS_START      ((intptr_t) CAP_NIL + 1)
+#define CAPS_SIZE       (INT_MAX - (int) CAPS_START)
 #define CAPS_LAST       (CAPS_SIZE - 1)
 

kernel/generic/src/lib/strtol.c

@@ -245 +245 @@
 }
 
-static inline intmax_t _strtosigned(const char *nptr, char **endptr, int base,
-    intmax_t min, intmax_t max, errno_t *err, bool nonstd)
-{
-        bool sgn = false;
-        uintmax_t number = _strtoumax(nptr, endptr, base, &sgn, err, nonstd);
-
-        if (number > (uintmax_t) max) {
-                if (sgn && (number - 1 == (uintmax_t) max)) {
-                        return min;
-                }
-
-                *err = nonstd ? EOVERFLOW : ERANGE;
-                return (sgn ? min : max);
-        }
-
-        return (sgn ? -number : number);
-}
-
 static inline uintmax_t _strtounsigned(const char *nptr, char **endptr, int base,
     uintmax_t max, errno_t *err, bool nonstd)

uspace/lib/cpp/include/cstddef

@@ -32 +32 @@
 #include <stddef.h>
 
+#ifdef __clang__
+typedef decltype(nullptr) nullptr_t;
+#endif
+
 namespace std
 {