From 56009ba0ed678cffa7bece86518aef47767b791b Mon Sep 17 00:00:00 2001 From: Eric van Gyzen Date: Tue, 5 Jun 2018 20:34:11 +0000 Subject: [PATCH] Make Coverity more happy with r334545 Coverity complains about: if (((flags) & M_WAITOK) || _malloc_item != NULL) saying: The expression 1 /* (2 | 0x100) & 2 */ || _malloc_item != NULL is suspicious because it performs a Boolean operation on a constant other than 0 or 1. Although the code is correct, add "!= 0" to make it slightly more legible and to silence hundreds(?) of Coverity warnings. Reported by: Coverity Discussed with: mjg Sponsored by: Dell EMC --- sys/sys/malloc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h index 62431510947..42ce14c2e64 100644 --- a/sys/sys/malloc.h +++ b/sys/sys/malloc.h @@ -191,9 +191,9 @@ void *malloc(size_t size, struct malloc_type *type, int flags) __malloc_like void *_malloc_item; \ size_t _size = (size); \ if (__builtin_constant_p(size) && __builtin_constant_p(flags) &&\ - ((flags) & M_ZERO)) { \ + ((flags) & M_ZERO) != 0) { \ _malloc_item = malloc(_size, type, (flags) &~ M_ZERO); \ - if (((flags) & M_WAITOK) || _malloc_item != NULL) \ + if (((flags) & M_WAITOK) != 0 || _malloc_item != NULL) \ bzero(_malloc_item, _size); \ } else { \ _malloc_item = malloc(_size, type, flags); \