diff options
Diffstat (limited to 'src/basic/macro.h')
| -rw-r--r-- | src/basic/macro.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/basic/macro.h b/src/basic/macro.h index a8476184c2d..90f4e02d190 100644 --- a/src/basic/macro.h +++ b/src/basic/macro.h @@ -214,7 +214,7 @@ static inline size_t GREEDY_ALLOC_ROUND_UP(size_t l) { * Contrary to strlen(), this is a constant expression. * @x: a string literal. */ -#define STRLEN(x) ((unsigned) sizeof(""x"") - 1) +#define STRLEN(x) (sizeof(""x"") - 1U) /* * container_of - cast a member of a structure out to the containing structure @@ -345,12 +345,12 @@ static inline int __coverity_check_and_return__(int condition) { (2U+(sizeof(type) <= 1 ? 3U : \ sizeof(type) <= 2 ? 5U : \ sizeof(type) <= 4 ? 10U : \ - sizeof(type) <= 8 ? 20U : (unsigned) sizeof(int[-2*(sizeof(type) > 8)]))) + sizeof(type) <= 8 ? 20U : sizeof(int[-2*(sizeof(type) > 8)]))) #define DECIMAL_STR_WIDTH(x) \ ({ \ typeof(x) _x_ = (x); \ - unsigned ans = 1; \ + size_t ans = 1; \ while ((_x_ /= 10) != 0) \ ans++; \ ans; \ |