Merge pull request #2848 from keszybz/clang-warnings

Clang warnings

src/basic/c-rbtree.c

@@ -195,11 +195,6 @@ static inline void c_rbnode_set_parent_and_color(CRBNode *n, CRBNode *p, unsigne
         n->__parent_and_color = (CRBNode*)((unsigned long)p | c);
 }
 
-/* same as c_rbnode_set_parent_and_color(), but keeps the current parent */
-static inline void c_rbnode_set_color(CRBNode *n, unsigned long c) {
-        c_rbnode_set_parent_and_color(n, c_rbnode_parent(n), c);
-}
-
 /* same as c_rbnode_set_parent_and_color(), but keeps the current color */
 static inline void c_rbnode_set_parent(CRBNode *n, CRBNode *p) {
         c_rbnode_set_parent_and_color(n, p, c_rbnode_color(n));

src/basic/log.h

@@ -246,5 +246,4 @@ int log_syntax_internal(
                         log_syntax_internal(unit, _level, config_file, config_line, 0, __FILE__, __LINE__, __func__, \
                                             "String is not UTF-8 clean, ignoring assignment: %s", strna(_p)); \
                 }                                                       \
-                -EINVAL;                                                \
         })

src/basic/macro.h

@@ -27,7 +27,11 @@
 #include <sys/types.h>
 
 #define _printf_(a,b) __attribute__ ((format (printf, a, b)))
-#define _alloc_(...) __attribute__ ((alloc_size(__VA_ARGS__)))
+#ifdef __clang__
+#  define _alloc_(...)
+#else
+#  define _alloc_(...) __attribute__ ((alloc_size(__VA_ARGS__)))
+#endif
 #define _sentinel_ __attribute__ ((sentinel))
 #define _unused_ __attribute__ ((unused))
 #define _destructor_ __attribute__ ((destructor))