Module Name: src
Committed By: joerg
Date: Wed May 23 21:21:27 UTC 2018
Modified Files:
src/lib/libc/stdlib: merge.c
Log Message:
Simplify to avoid pointless null pointer arithmetic.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/stdlib/merge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/stdlib/merge.c
diff -u src/lib/libc/stdlib/merge.c:1.15 src/lib/libc/stdlib/merge.c:1.16
--- src/lib/libc/stdlib/merge.c:1.15 Sat Aug 12 01:10:04 2017
+++ src/lib/libc/stdlib/merge.c Wed May 23 21:21:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: merge.c,v 1.15 2017/08/12 01:10:04 ginsbach Exp $ */
+/* $NetBSD: merge.c,v 1.16 2018/05/23 21:21:27 joerg Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "from: @(#)merge.c 8.2 (Berkeley) 2/14/94";
#else
-__RCSID("$NetBSD: merge.c,v 1.15 2017/08/12 01:10:04 ginsbach Exp $");
+__RCSID("$NetBSD: merge.c,v 1.16 2018/05/23 21:21:27 joerg Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -101,8 +101,7 @@ static void insertionsort(u_char *, size
*/
/* Assumption: PSIZE is a power of 2. */
#define EVAL(p) ((u_char **)(void *) \
- ((u_char *)0 + \
- (((u_char *)(void *)(p) + PSIZE - 1 - (u_char *) 0) & ~(PSIZE - 1))))
+ (((u_char *)(void *)(p) + PSIZE - 1 - (u_char *) 0) & ~(PSIZE - 1)))
/*
* Arguments are as for qsort.
