summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2018-05-23 21:20:20 +0000
committerjoerg <joerg@NetBSD.org>2018-05-23 21:20:20 +0000
commit3a4ab9ee2284b0307c19c0583a881682a77a4fcf (patch)
tree13448b915c5cae1d131362c004108bf6851b603b /usr.bin
parent6e353391b65c35f73990570c0676e47410f75904 (diff)
deconst -> __UNCONST to avoid null pointer arithmetic
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/mkdep/mkdep.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/usr.bin/mkdep/mkdep.c b/usr.bin/mkdep/mkdep.c
index e754d2c5572..38d17884672 100644
--- a/usr.bin/mkdep/mkdep.c
+++ b/usr.bin/mkdep/mkdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mkdep.c,v 1.44 2015/06/16 22:54:10 christos Exp $ */
+/* $NetBSD: mkdep.c,v 1.45 2018/05/23 21:20:20 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#if !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1999 The NetBSD Foundation, Inc.\
All rights reserved.");
-__RCSID("$NetBSD: mkdep.c,v 1.44 2015/06/16 22:54:10 christos Exp $");
+__RCSID("$NetBSD: mkdep.c,v 1.45 2018/05/23 21:20:20 joerg Exp $");
#endif /* not lint */
#include <sys/mman.h>
@@ -82,12 +82,6 @@ static int verbose;
static void save_for_optional(const char *, const char *);
static size_t write_optional(int, opt_t *, size_t);
-static inline void *
-deconst(const void *p)
-{
- return (const char *)p - (const char *)0 + (char *)0;
-}
-
__dead static void
usage(void)
{
@@ -119,8 +113,8 @@ run_cc(int argc, char **argv, const char **fname)
if ((args = malloc((argc + 3) * sizeof(char *))) == NULL)
err(EXIT_FAILURE, "malloc");
- args[0] = deconst(CC);
- args[1] = deconst("-M");
+ args[0] = __UNCONST(CC);
+ args[1] = __UNCONST("-M");
(void)memcpy(&args[2], argv, (argc + 1) * sizeof(char *));
if ((tmpdir = getenv("TMPDIR")) == NULL)