From: Guillem Jover <guillem@hadrons.org>
Date: Tue, 14 Nov 2023 18:15:11 +0000 (+0100)
Subject: Do not add a pointer to the NULL constant
X-Git-Tag: 0.11.8~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ecb44e165514885648240c1b139c4ab0c212a0fa;p=thirdparty%2Flibbsd.git

Do not add a pointer to the NULL constant

Warned-by: cppcheck (nullPointerArithmetic)
---

diff --git a/src/merge.c b/src/merge.c
index c43866f..3f1b3fb 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -84,9 +84,8 @@ static void insertionsort(unsigned char *, size_t, size_t,
  */
 /* Assumption: PSIZE is a power of 2. */
 #define EVAL(p) (unsigned char **)					\
-	((unsigned char *)0 +						\
 	 (((unsigned char *)p + PSIZE - 1 -				\
-	   (unsigned char *)0) & ~(PSIZE - 1)))
+	   (unsigned char *)0) & ~(PSIZE - 1))
 
 /*
  * Arguments are as for qsort.