From 777003365a87aa6656938d0ecca9d54887fefab9 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 29 Jul 2021 17:45:19 +0200 Subject: [PATCH] macro: sizeof() returns size_t, and that's good Now that CONST_MAX() is a bit more foregiving, let's stick to the native return type of sizeof() everywhere, which is size_t, instead of casting to "unsigned", so that on the common archs we don't unnecessarily lose the upper 32bits. This semi-reverts d3e40294572512810c9329933a488619e7ce22fd. --- src/basic/macro.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/basic/macro.h b/src/basic/macro.h index a8476184c2d..829d8dc8a70 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,7 +345,7 @@ 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) \ ({ \ -- 2.47.3