From 386e87b815696fbe5950138b551b8451a6b8321c Mon Sep 17 00:00:00 2001 From: mmcc Date: Wed, 21 Oct 2015 15:20:37 +0000 Subject: [PATCH] Don't bother casting NULL. ok nicm@ --- bin/ksh/c_ksh.c | 4 ++-- bin/ksh/c_sh.c | 4 ++-- bin/ksh/history.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/ksh/c_ksh.c b/bin/ksh/c_ksh.c index a8bb906bda8..7514eb12ad0 100644 --- a/bin/ksh/c_ksh.c +++ b/bin/ksh/c_ksh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: c_ksh.c,v 1.45 2015/10/19 14:42:16 mmcc Exp $ */ +/* $OpenBSD: c_ksh.c,v 1.46 2015/10/21 15:20:37 mmcc Exp $ */ /* * built-in Korn commands: c_* @@ -1356,7 +1356,7 @@ c_bind(char **wp) wp += builtin_opt.optind; if (*wp == NULL) /* list all */ - rv = x_bind((char*)NULL, (char*)NULL, 0, list); + rv = x_bind(NULL, NULL, 0, list); for (; *wp != NULL; wp++) { cp = strchr(*wp, '='); diff --git a/bin/ksh/c_sh.c b/bin/ksh/c_sh.c index dcb8e0a97e1..52ff50af60c 100644 --- a/bin/ksh/c_sh.c +++ b/bin/ksh/c_sh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: c_sh.c,v 1.52 2015/10/19 14:42:16 mmcc Exp $ */ +/* $OpenBSD: c_sh.c,v 1.53 2015/10/21 15:20:37 mmcc Exp $ */ /* * built-in Bourne commands @@ -658,7 +658,7 @@ c_unset(char **wp) } unset(vp, strchr(id, '[') ? 1 : 0); } else { /* unset function */ - define(id, (struct op *) NULL); + define(id, NULL); } return 0; } diff --git a/bin/ksh/history.c b/bin/ksh/history.c index 74aae960910..34f3075077b 100644 --- a/bin/ksh/history.c +++ b/bin/ksh/history.c @@ -1,4 +1,4 @@ -/* $OpenBSD: history.c,v 1.49 2015/10/19 14:42:16 mmcc Exp $ */ +/* $OpenBSD: history.c,v 1.50 2015/10/21 15:20:37 mmcc Exp $ */ /* * command history @@ -554,7 +554,7 @@ sethistfile(const char *name) void init_histvec(void) { - if (history == (char **)NULL) { + if (history == NULL) { histsize = HISTORYSIZE; history = alloc(histsize*sizeof (char *), APERM); histptr = history - 1; -- 2.20.1