Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify to avoid pointless null pointer arithmetic.

This commit is contained in:
joerg 2018-05-23 21:21:27 +00:00
parent cebcb94770
commit 5b49b507f5
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libc/stdlib/merge.c
View File

@ -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_t, size_t,
*/
/* 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.