diff options
| author |   Neale Ranns <nranns@cisco.com> | 2018-08-06 08:16:29 -0400 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2018-08-06 15:46:15 +0000 |
| commit | a88c916e5dfb65ccfbe7efc3e0df7db8dac73e78 (patch) | |
| tree | 367afffc75676f088ed1e0cfe4d638dd4eed352a | |
| parent | 6763a1d1346aabd6ed2d8d0737e336c40c914028 (diff) | |
dlmalloc compiles errors with clang
of the form:
/home/nranns/Src/vpp/build-data/../src/vppinfra/dlmalloc.c:4327:7: error: logical not is only applied to the left hand side of this comparison [-Werror,-Wlogical-not-parentheses]
if (!(ms)->magic == mparams.magic) {
/home/nranns/Src/vpp/build-data/../src/vppinfra/dlmalloc.c:4696:20: error: equality comparison with extraneous parentheses [-Werror,-Wparentheses-equality]
if (((ms)->magic == mparams.magic)) {
$ lsb_release -a
No LSB modules are available.
Distributor ID: Ubuntu
Description: Ubuntu 16.04.2 LTS
Release: 16.04
Codename: xenial
$ clang --version
clang version 3.8.0-2ubuntu4 (tags/RELEASE_380/final)
Target: x86_64-pc-linux-gnu
Thread model: posix
InstalledDir: /usr/bin
Change-Id: If6d70a87420bd54c8e1b8be1d9e9031f6c699c45
Signed-off-by: Neale Ranns <nranns@cisco.com>
| -rw-r--r-- | src/vppinfra/dlmalloc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/vppinfra/dlmalloc.c b/src/vppinfra/dlmalloc.c index 1bc8f656b66..1b4d226a827 100644 --- a/src/vppinfra/dlmalloc.c +++ b/src/vppinfra/dlmalloc.c @@ -1612,7 +1612,11 @@ static size_t traverse_and_check(mstate m); #if (FOOTERS && !INSECURE) /* Check if (alleged) mstate m has expected magic field */ -#define ok_magic(M) ((M)->magic == mparams.magic) +static inline int +ok_magic (const mstate m) +{ + return (m->magic == mparams.magic); +} #else /* (FOOTERS && !INSECURE) */ #define ok_magic(M) (1) #endif /* (FOOTERS && !INSECURE) */ |