summaryrefslogtreecommitdiff
path: root/bin/ksh
diff options
context:
space:
mode:
authorkamil <kamil@NetBSD.org>2018-01-24 09:21:20 +0000
committerkamil <kamil@NetBSD.org>2018-01-24 09:21:20 +0000
commita1e1dcf1c16cd1fe6bf2af049d8390363defdb39 (patch)
tree8edab6fa5ce37b163c1a63710edb60b7cd554fb8 /bin/ksh
parent474ee3bb7ec87bb5d608d37526dcb71b33e91926 (diff)
ksh: Rename a local function tdelete to mytdelete
This removes a clash with well-known libc function tdelete(3) from POSIX. This allows to build ksh against MSan. The new name might not be perfect, but long term ksh should be switched to the libc version. Sponsored by <The NetBSD Foundation>
Diffstat (limited to 'bin/ksh')
-rw-r--r--bin/ksh/exec.c6
-rw-r--r--bin/ksh/proto.h6
-rw-r--r--bin/ksh/table.c6
-rw-r--r--bin/ksh/var.c6
4 files changed, 12 insertions, 12 deletions
diff --git a/bin/ksh/exec.c b/bin/ksh/exec.c
index 3d97c3e9216..9bd873b5293 100644
--- a/bin/ksh/exec.c
+++ b/bin/ksh/exec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.c,v 1.24 2017/07/01 23:12:08 joerg Exp $ */
+/* $NetBSD: exec.c,v 1.25 2018/01/24 09:21:20 kamil Exp $ */
/*
* execute command tree
@@ -6,7 +6,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: exec.c,v 1.24 2017/07/01 23:12:08 joerg Exp $");
+__RCSID("$NetBSD: exec.c,v 1.25 2018/01/24 09:21:20 kamil Exp $");
#endif
#include <sys/stat.h>
@@ -843,7 +843,7 @@ define(name, t)
}
if (t == NULL) { /* undefine */
- tdelete(tp);
+ mytdelete(tp);
return was_set ? 0 : 1;
}
diff --git a/bin/ksh/proto.h b/bin/ksh/proto.h
index a0b231e7b67..88de65c88d3 100644
--- a/bin/ksh/proto.h
+++ b/bin/ksh/proto.h
@@ -1,9 +1,9 @@
-/* $NetBSD: proto.h,v 1.10 2017/07/01 23:12:08 joerg Exp $ */
+/* $NetBSD: proto.h,v 1.11 2018/01/24 09:21:20 kamil Exp $ */
/*
* prototypes for PD-KSH
* originally generated using "cproto.c 3.5 92/04/11 19:28:01 cthuang "
- * $Id: proto.h,v 1.10 2017/07/01 23:12:08 joerg Exp $
+ * $Id: proto.h,v 1.11 2018/01/24 09:21:20 kamil Exp $
*/
#include <stdbool.h>
@@ -218,7 +218,7 @@ unsigned int hash ARGS((const char *));
void tinit ARGS((struct table *, Area *, int));
struct tbl * tsearch ARGS((struct table *, const char *, unsigned int));
struct tbl * tenter ARGS((struct table *, const char *, unsigned int));
-void tdelete ARGS((struct tbl *));
+void mytdelete ARGS((struct tbl *));
void twalk ARGS((struct tstate *, struct table *));
struct tbl * tnext ARGS((struct tstate *));
struct tbl ** tsort ARGS((struct table *));
diff --git a/bin/ksh/table.c b/bin/ksh/table.c
index 025b56d27b2..6442cdf7c39 100644
--- a/bin/ksh/table.c
+++ b/bin/ksh/table.c
@@ -1,4 +1,4 @@
-/* $NetBSD: table.c,v 1.4 2003/06/23 11:39:04 agc Exp $ */
+/* $NetBSD: table.c,v 1.5 2018/01/24 09:21:20 kamil Exp $ */
/*
* dynamic hashed associative table for commands and variables
@@ -6,7 +6,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: table.c,v 1.4 2003/06/23 11:39:04 agc Exp $");
+__RCSID("$NetBSD: table.c,v 1.5 2018/01/24 09:21:20 kamil Exp $");
#endif
@@ -144,7 +144,7 @@ tenter(tp, n, h)
}
void
-tdelete(p)
+mytdelete(p)
register struct tbl *p;
{
p->flag = 0;
diff --git a/bin/ksh/var.c b/bin/ksh/var.c
index 03e0af9936d..55eabad03e3 100644
--- a/bin/ksh/var.c
+++ b/bin/ksh/var.c
@@ -1,9 +1,9 @@
-/* $NetBSD: var.c,v 1.21 2017/07/01 23:12:08 joerg Exp $ */
+/* $NetBSD: var.c,v 1.22 2018/01/24 09:21:20 kamil Exp $ */
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: var.c,v 1.21 2017/07/01 23:12:08 joerg Exp $");
+__RCSID("$NetBSD: var.c,v 1.22 2018/01/24 09:21:20 kamil Exp $");
#endif
#include <sys/stat.h>
@@ -939,7 +939,7 @@ unspecial(name)
tp = tsearch(&specials, name, hash(name));
if (tp)
- tdelete(tp);
+ mytdelete(tp);
}
#ifdef KSH