diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2019-09-21 17:48:50 +0200 |
|---|---|---|
| committer | Chris Down <chris@chrisdown.name> | 2019-10-02 10:43:47 +0100 |
| commit | 065a74a7d8edc8a67e750bbaff5e0667e6782933 (patch) | |
| tree | 9de1ca88236729f1aa132bea353277f9edef01b0 /src/basic | |
| parent | 2bfd08ce383a818894b755ebf009c20cb6785a05 (diff) | |
| download | systemd-065a74a7d8edc8a67e750bbaff5e0667e6782933.tar.gz | |
basic: fix ASSERT_SIDE_EFFECT Coverity report in assert_se()
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/macro.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/basic/macro.h b/src/basic/macro.h index 336cb3a099..18e5085669 100644 --- a/src/basic/macro.h +++ b/src/basic/macro.h @@ -307,17 +307,18 @@ static inline unsigned long ALIGN_POWER2(unsigned long u) { extern void __coverity_panic__(void); -static inline int __coverity_check__(int condition) { +static inline void __coverity_check__(int condition) { + if (!condition) + __coverity_panic__(); +} + +static inline int __coverity_check_and_return__(int condition) { return condition; } -#define assert_message_se(expr, message) \ - do { \ - if (__coverity_check__(!(expr))) \ - __coverity_panic__(); \ - } while (false) +#define assert_message_se(expr, message) __coverity_check__(!!(expr)) -#define assert_log(expr, message) __coverity_check__(!!(expr)) +#define assert_log(expr, message) __coverity_check_and_return__(!!(expr)) #else /* ! __COVERITY__ */ |