summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2014-01-16 20:31:42 +0000
committerchristos <christos@NetBSD.org>2014-01-16 20:31:42 +0000
commitf3edbddfd4a4d4c0fc1a401fec00c1f1acc9e84e (patch)
tree8e8c7332635060ab2e89658909bf67dba0ba3f75 /lib
parent9164993e7a0867ccd8a36adac26c5aed8ae55a47 (diff)
"soon" is "now". Remove all __indr_reference crap.
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/compat/gen/Makefile.inc3
-rw-r--r--lib/libc/compat/gen/compat__sys_errlist.c45
-rw-r--r--lib/libc/compat/gen/compat__sys_nerr.c17
-rw-r--r--lib/libc/compat/gen/compat__sys_siglist.c35
-rw-r--r--lib/libc/gdtoa/Makefile.inc6
-rw-r--r--lib/libc/gdtoa/_strtof.c54
-rw-r--r--lib/libc/gdtoa/_strtold.c45
-rw-r--r--lib/libc/gen/Makefile.inc7
-rw-r--r--lib/libc/gen/_err.c30
-rw-r--r--lib/libc/gen/_errc.c30
-rw-r--r--lib/libc/gen/_errx.c30
-rw-r--r--lib/libc/gen/_sysconf.c45
-rw-r--r--lib/libc/gen/_verr.c27
-rw-r--r--lib/libc/gen/_verrc.c27
-rw-r--r--lib/libc/gen/_verrx.c27
-rw-r--r--lib/libc/gen/_vwarn.c27
-rw-r--r--lib/libc/gen/_vwarnc.c27
-rw-r--r--lib/libc/gen/_vwarnx.c27
-rw-r--r--lib/libc/gen/_warn.c30
-rw-r--r--lib/libc/gen/_warnc.c30
-rw-r--r--lib/libc/gen/_warnx.c31
-rw-r--r--lib/libc/inet/Makefile.inc4
-rw-r--r--lib/libc/inet/_inet_aton.c29
-rw-r--r--lib/libc/inet/_inet_pton.c29
-rw-r--r--lib/libc/resolv/Makefile.inc5
-rw-r--r--lib/libc/resolv/__dn_comp.c34
-rw-r--r--lib/libc/resolv/__res_close.c33
-rw-r--r--lib/libc/resolv/__res_send.c33
-rw-r--r--lib/libc/stdio/Makefile.inc5
-rw-r--r--lib/libc/stdio/_fileno.c46
-rw-r--r--lib/libc/stdio/_fseeko.c45
-rw-r--r--lib/libc/stdio/_ftello.c45
-rw-r--r--lib/libc/sys/Makefile.inc5
-rw-r--r--lib/libc/sys/_brk.c45
-rw-r--r--lib/libc/sys/_fork.c45
-rw-r--r--lib/libc/sys/_getcontext.c36
-rw-r--r--lib/libc/sys/_pipe.c45
-rw-r--r--lib/libc/sys/_sbrk.c45
-rw-r--r--lib/libc/time/Makefile.inc5
-rw-r--r--lib/libc/time/_daylight.c16
40 files changed, 11 insertions, 1139 deletions
diff --git a/lib/libc/compat/gen/Makefile.inc b/lib/libc/compat/gen/Makefile.inc
index f88932022d9..9ee778f31c3 100644
--- a/lib/libc/compat/gen/Makefile.inc
+++ b/lib/libc/compat/gen/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.16 2012/10/24 22:10:52 christos Exp $
+# $NetBSD: Makefile.inc,v 1.17 2014/01/16 20:31:42 christos Exp $
.PATH: ${COMPATDIR}/gen
SRCS+=compat_errlist.c compat_fts.c compat___fts13.c compat___fts30.c \
@@ -6,7 +6,6 @@ SRCS+=compat_errlist.c compat_fts.c compat___fts13.c compat___fts30.c \
compat_opendir.c compat_readdir.c compat__readdir_unlocked30.c \
compat_scandir.c compat_siglist.c compat_signame.c compat_sigsetops.c \
compat_times.c compat_timezone.c compat_unvis.c compat_utmpx.c \
- compat__sys_errlist.c compat__sys_nerr.c compat__sys_siglist.c \
compat_time.c compat_utime.c compat_devname.c compat_alphasort.c \
compat_getpwent.c compat___fts32.c compat_utmp.c compat___fts50.c \
compat___unvis13.c compat_syslog.c compat_alloca.c
diff --git a/lib/libc/compat/gen/compat__sys_errlist.c b/lib/libc/compat/gen/compat__sys_errlist.c
deleted file mode 100644
index b4b34324ba5..00000000000
--- a/lib/libc/compat/gen/compat__sys_errlist.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $NetBSD: compat__sys_errlist.c,v 1.1 2005/09/13 01:44:09 christos Exp $ */
-
-/*
- * Written by J.T. Conklin, December 12, 1994
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat__sys_errlist.c,v 1.1 2005/09/13 01:44:09 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-__warn_references(sys_errlist,
- "warning: reference to compatibility sys_errlist[]; include <errno.h> for correct reference")
-__warn_references(__sys_errlist,
- "warning: reference to deprecated __sys_errlist[]; include <errno.h> and use sys_errlist")
-
-__warn_references(sys_nerr,
- "warning: reference to compatibility sys_nerr; include <errno.h> for correct reference")
-__warn_references(__sys_nerr,
- "warning: reference to deprecated __sys_nerr; include <errno.h> and use sys_nerr")
-
-
-#if defined(__indr_reference)
-__indr_reference(_sys_errlist, sys_errlist)
-__indr_reference(_sys_errlist, __sys_errlist) /* Backwards compat with v.12 */
-#else
-
-#undef _sys_errlist
-#undef _sys_nerr
-#undef rcsid
-#define _sys_errlist sys_errlist
-#define _sys_nerr sys_nerr
-#define rcsid _rcsid
-#include "__errlist.c"
-
-#undef _sys_errlist
-#undef _sys_nerr
-#undef rcsid
-#define _sys_errlist __sys_errlist
-#define _sys_nerr __sys_nerr
-#define rcsid __rcsid
-#include "__errlist.c"
-
-#endif
diff --git a/lib/libc/compat/gen/compat__sys_nerr.c b/lib/libc/compat/gen/compat__sys_nerr.c
deleted file mode 100644
index 7d095864d76..00000000000
--- a/lib/libc/compat/gen/compat__sys_nerr.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: compat__sys_nerr.c,v 1.1 2005/09/13 01:44:09 christos Exp $ */
-
-/*
- * Written by J.T. Conklin, December 12, 1994
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat__sys_nerr.c,v 1.1 2005/09/13 01:44:09 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(__indr_reference) && !defined(__lint__)
-__indr_reference(_sys_nerr, sys_nerr)
-__indr_reference(_sys_nerr, __sys_nerr) /* Backwards compat with v.12 */
-#endif
-/* LINTED empty translation unit */
diff --git a/lib/libc/compat/gen/compat__sys_siglist.c b/lib/libc/compat/gen/compat__sys_siglist.c
deleted file mode 100644
index 54435bf53a2..00000000000
--- a/lib/libc/compat/gen/compat__sys_siglist.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* $NetBSD: compat__sys_siglist.c,v 1.1 2005/09/13 01:44:09 christos Exp $ */
-
-/*
- * Written by J.T. Conklin, December 12, 1994
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat__sys_siglist.c,v 1.1 2005/09/13 01:44:09 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-__warn_references(sys_siglist,
- "warning: reference to compatibility sys_siglist[]; include <signal.h> or <unistd.h> for correct reference")
-__warn_references(__sys_siglist,
- "warning: reference to deprecated __sys_siglist[]; include <signal.h> or <unistd.h> and use sys_siglist")
-
-#if defined(__indr_reference) && !defined(__lint__)
-__indr_reference(_sys_siglist, sys_siglist)
-__indr_reference(_sys_siglist, __sys_siglist) /* Backwards compat with v.12 */
-#else
-
-#undef _sys_siglist
-#undef rcsid
-#define _sys_siglist sys_siglist
-#define rcsid _rcsid
-#include "compat_siglist.c"
-
-#undef _sys_siglist
-#undef rcsid
-#define _sys_siglist __sys_siglist
-#define rcsid __rcsid
-#include "compat_siglist.c"
-
-#endif
diff --git a/lib/libc/gdtoa/Makefile.inc b/lib/libc/gdtoa/Makefile.inc
index e969c94b5d2..19268daa914 100644
--- a/lib/libc/gdtoa/Makefile.inc
+++ b/lib/libc/gdtoa/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.9 2013/04/19 20:18:33 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.10 2014/01/16 20:31:42 christos Exp $
# gdtoa sources
.PATH: ${.CURDIR}/gdtoa
@@ -36,10 +36,6 @@ SRCS+= dmisc.c \
smisc.c strtodg.c sum.c \
ulp.c
-# wrappers
-SRCS+= _strtof.c _strtold.c
-#SRCS+= _hdtoa.c _ldtoa.c
-
# XXX no hexadecimal floating-point string conversion for VAX FP yet
.if ${MACHINE_ARCH} != "vax"
SRCS+= strtord.c
diff --git a/lib/libc/gdtoa/_strtof.c b/lib/libc/gdtoa/_strtof.c
deleted file mode 100644
index 03d02e6825d..00000000000
--- a/lib/libc/gdtoa/_strtof.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $NetBSD: _strtof.c,v 1.3 2013/04/18 21:54:10 joerg Exp $ */
-
-/*
- * Copyright (c) 1996 Christos Zoulas. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _strtof.c,v 1.3 2013/04/18 21:54:10 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(__indr_reference)
-__indr_reference(_strtof, strtof)
-__indr_reference(_strtof_l, strtof_l)
-#else
-
-#include <stdlib.h>
-float _strtof(const char * __restrict, char ** __restrict);
-float _strtof_l(const char * __restrict, char ** __restrict, locale_t);
-
-float
-strtof(const char *nptr, char **endptr)
-{
-
- return _strtof(nptr, endptr);
-}
-
-float
-strtof_l(const char *nptr, char **endptr, locale_t loc)
-{
-
- return _strtof_l(nptr, endptr, loc);
-}
-#endif
diff --git a/lib/libc/gdtoa/_strtold.c b/lib/libc/gdtoa/_strtold.c
deleted file mode 100644
index 475f8dab734..00000000000
--- a/lib/libc/gdtoa/_strtold.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $NetBSD: _strtold.c,v 1.2 2009/10/21 01:07:45 snj Exp $ */
-
-/*
- * Copyright (c) 1996 Christos Zoulas. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _strtold.c,v 1.2 2009/10/21 01:07:45 snj Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(__indr_reference)
-__indr_reference(_strtold, strtold)
-#else
-
-#include <stdlib.h>
-long double _strtold(const char * __restrict, char ** __restrict);
-
-long double
-strtold(const char *nptr, char **endptr)
-{
-
- return _strtold(nptr, endptr);
-}
-#endif
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index 32368d437a2..79abbd4668d 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.186 2014/01/16 17:21:38 christos Exp $
+# $NetBSD: Makefile.inc,v 1.187 2014/01/16 20:31:42 christos Exp $
# from: @(#)Makefile.inc 8.6 (Berkeley) 5/4/95
# gen sources
@@ -34,11 +34,6 @@ SRCS+= _errno.c alarm.c alphasort.c arc4random.c assert.c basename.c clock.c \
utmpx.c valloc.c vis.c wait.c wait3.c waitpid.c warn.c warnx.c \
warnc.c vwarn.c vwarnx.c vwarnc.c verr.c verrx.c verrc.c wordexp.c
-# indirect reference stubs, to be removed soon.
-SRCS+= _err.c _errx.c _errc.c \
- _sysconf.c _verr.c _verrx.c _verrc.c _vwarn.c _vwarnx.c _vwarnc.c \
- _warn.c _warnx.c _warnc.c
-
# uses alloca
COPTS.execvp.c = -Wno-stack-protector
COPTS.execl.c = -Wno-stack-protector
diff --git a/lib/libc/gen/_err.c b/lib/libc/gen/_err.c
deleted file mode 100644
index 9b2024d8f64..00000000000
--- a/lib/libc/gen/_err.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* $NetBSD: _err.c,v 1.12 2011/07/17 20:54:34 joerg Exp $ */
-
-/*
- * J.T. Conklin, December 12, 1994
- * Public Domain
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _err.c,v 1.12 2011/07/17 20:54:34 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(__indr_reference)
-__indr_reference(_err, err)
-#else
-
-#include <stdarg.h>
-
-__dead void _verr(int eval, const char *, va_list);
-
-__dead void
-err(int eval, const char *fmt, ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- _verr(eval, fmt, ap);
- va_end(ap);
-}
-#endif
diff --git a/lib/libc/gen/_errc.c b/lib/libc/gen/_errc.c
deleted file mode 100644
index c16df491f71..00000000000
--- a/lib/libc/gen/_errc.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* $NetBSD: _errc.c,v 1.1 2014/01/16 17:21:38 christos Exp $ */
-
-/*
- * J.T. Conklin, December 12, 1994
- * Public Domain
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _errc.c,v 1.1 2014/01/16 17:21:38 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(__indr_reference)
-__indr_reference(_errc, errc)
-#else
-
-#include <stdarg.h>
-
-__dead void _verrc(int eval, int code, const char *, va_list);
-
-__dead void
-errc(int eval, int code, const char *fmt, ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- _verr(eval, code, fmt, ap);
- va_end(ap);
-}
-#endif
diff --git a/lib/libc/gen/_errx.c b/lib/libc/gen/_errx.c
deleted file mode 100644
index 5a1345ede0e..00000000000
--- a/lib/libc/gen/_errx.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* $NetBSD: _errx.c,v 1.12 2011/07/17 20:54:34 joerg Exp $ */
-
-/*
- * J.T. Conklin, December 12, 1994
- * Public Domain
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _errx.c,v 1.12 2011/07/17 20:54:34 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(__indr_reference)
-__indr_reference(_errx, errx)
-#else
-
-#include <stdarg.h>
-
-__dead void _verrx(int eval, const char *, va_list);
-
-__dead void
-errx(int eval, const char *fmt, ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- _verrx(eval, fmt, ap);
- va_end(ap);
-}
-#endif
diff --git a/lib/libc/gen/_sysconf.c b/lib/libc/gen/_sysconf.c
deleted file mode 100644
index c39248e1954..00000000000
--- a/lib/libc/gen/_sysconf.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $NetBSD: _sysconf.c,v 1.6 2012/03/20 16:36:04 matt Exp $ */
-
-/*
- * Copyright (c) 1996 Christos Zoulas. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _sysconf.c,v 1.6 2012/03/20 16:36:04 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(__indr_reference)
-__indr_reference(__sysconf, sysconf)
-#else
-
-#include <unistd.h>
-long __sysconf(int); /* XXX */
-
-long
-sysconf(int name)
-{
-
- return __sysconf(name);
-}
-#endif
diff --git a/lib/libc/gen/_verr.c b/lib/libc/gen/_verr.c
deleted file mode 100644
index 23577bae7fe..00000000000
--- a/lib/libc/gen/_verr.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* $NetBSD: _verr.c,v 1.11 2011/07/17 20:54:34 joerg Exp $ */
-
-/*
- * J.T. Conklin, December 12, 1994
- * Public Domain
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _verr.c,v 1.11 2011/07/17 20:54:34 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <stdarg.h>
-
-#if defined(__indr_reference)
-__indr_reference(_verr, verr)
-#else
-
-__dead void _verr(int, const char *, va_list);
-
-void
-verr(int eval, const char *fmt, va_list ap)
-{
- _verr(eval, fmt, ap);
-}
-
-#endif
diff --git a/lib/libc/gen/_verrc.c b/lib/libc/gen/_verrc.c
deleted file mode 100644
index 6e8bcfed87b..00000000000
--- a/lib/libc/gen/_verrc.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* $NetBSD: _verrc.c,v 1.1 2014/01/16 17:21:38 christos Exp $ */
-
-/*
- * J.T. Conklin, December 12, 1994
- * Public Domain
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _verrc.c,v 1.1 2014/01/16 17:21:38 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <stdarg.h>
-
-#if defined(__indr_reference)
-__indr_reference(_verrc, verrc)
-#else
-
-__dead void _verrc(int, int, const char *, va_list);
-
-void
-verrc(int eval, int code, const char *fmt, va_list ap)
-{
- _verrc(eval, code, fmt, ap);
-}
-
-#endif
diff --git a/lib/libc/gen/_verrx.c b/lib/libc/gen/_verrx.c
deleted file mode 100644
index 784d3c2b844..00000000000
--- a/lib/libc/gen/_verrx.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* $NetBSD: _verrx.c,v 1.11 2011/07/17 20:54:34 joerg Exp $ */
-
-/*
- * J.T. Conklin, December 12, 1994
- * Public Domain
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _verrx.c,v 1.11 2011/07/17 20:54:34 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <stdarg.h>
-
-#if defined(__indr_reference)
-__indr_reference(_verrx, verrx)
-#else
-
-__dead void _verrx(int, const char *, va_list);
-
-void
-verrx(int eval, const char *fmt, va_list ap)
-{
- _verrx(eval, fmt, ap);
-}
-
-#endif
diff --git a/lib/libc/gen/_vwarn.c b/lib/libc/gen/_vwarn.c
deleted file mode 100644
index 47b843901d5..00000000000
--- a/lib/libc/gen/_vwarn.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* $NetBSD: _vwarn.c,v 1.11 2011/07/17 20:54:34 joerg Exp $ */
-
-/*
- * J.T. Conklin, December 12, 1994
- * Public Domain
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _vwarn.c,v 1.11 2011/07/17 20:54:34 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <stdarg.h>
-
-#if defined(__indr_reference)
-__indr_reference(_vwarn, vwarn)
-#else
-
-void _vwarn(const char *, va_list);
-
-void
-vwarn(const char *fmt, va_list ap)
-{
- _vwarn(fmt, ap);
-}
-
-#endif
diff --git a/lib/libc/gen/_vwarnc.c b/lib/libc/gen/_vwarnc.c
deleted file mode 100644
index 0f70c404a7f..00000000000
--- a/lib/libc/gen/_vwarnc.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* $NetBSD: _vwarnc.c,v 1.1 2014/01/16 17:21:38 christos Exp $ */
-
-/*
- * J.T. Conklin, December 12, 1994
- * Public Domain
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _vwarnc.c,v 1.1 2014/01/16 17:21:38 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <stdarg.h>
-
-#if defined(__indr_reference)
-__indr_reference(_vwarnc, vwarnc)
-#else
-
-void _vwarnc(int code, const char *, va_list);
-
-void
-vwarnc(int code, const char *fmt, va_list ap)
-{
- _vwarnc(code, fmt, ap);
-}
-
-#endif
diff --git a/lib/libc/gen/_vwarnx.c b/lib/libc/gen/_vwarnx.c
deleted file mode 100644
index 790059433bf..00000000000
--- a/lib/libc/gen/_vwarnx.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* $NetBSD: _vwarnx.c,v 1.11 2011/07/17 20:54:34 joerg Exp $ */
-
-/*
- * J.T. Conklin, December 12, 1994
- * Public Domain
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _vwarnx.c,v 1.11 2011/07/17 20:54:34 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <stdarg.h>
-
-#if defined(__indr_reference)
-__indr_reference(_vwarnx, vwarnx)
-#else
-
-void _vwarnx(const char *, va_list);
-
-void
-vwarnx(const char *fmt, va_list ap)
-{
- _vwarnx(fmt, ap);
-}
-
-#endif
diff --git a/lib/libc/gen/_warn.c b/lib/libc/gen/_warn.c
deleted file mode 100644
index 23fb6fa31a2..00000000000
--- a/lib/libc/gen/_warn.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* $NetBSD: _warn.c,v 1.11 2011/07/17 20:54:34 joerg Exp $ */
-
-/*
- * J.T. Conklin, December 12, 1994
- * Public Domain
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _warn.c,v 1.11 2011/07/17 20:54:34 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(__indr_reference)
-__indr_reference(_warn, warn)
-#else
-
-#include <stdarg.h>
-
-void _vwarn(const char *, va_list);
-
-void
-warn(const char *fmt, ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- _vwarn(eval, fmt, ap);
- va_end(ap);
-}
-#endif
diff --git a/lib/libc/gen/_warnc.c b/lib/libc/gen/_warnc.c
deleted file mode 100644
index 015f720e4d1..00000000000
--- a/lib/libc/gen/_warnc.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* $NetBSD: _warnc.c,v 1.1 2014/01/16 17:21:38 christos Exp $ */
-
-/*
- * J.T. Conklin, December 12, 1994
- * Public Domain
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _warnc.c,v 1.1 2014/01/16 17:21:38 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(__indr_reference)
-__indr_reference(_warnc, warnc)
-#else
-
-#include <stdarg.h>
-
-void _vwarnc(int, const char *, va_list);
-
-void
-warnc(int code, const char *fmt, ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- _vwarnc(code, fmt, ap);
- va_end(ap);
-}
-#endif
diff --git a/lib/libc/gen/_warnx.c b/lib/libc/gen/_warnx.c
deleted file mode 100644
index fdf108d1448..00000000000
--- a/lib/libc/gen/_warnx.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* $NetBSD: _warnx.c,v 1.11 2011/07/17 20:54:34 joerg Exp $ */
-
-/*
- * J.T. Conklin, December 12, 1994
- * Public Domain
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _warnx.c,v 1.11 2011/07/17 20:54:34 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(__indr_reference)
-__indr_reference(_warnx, warnx)
-#else
-
-#include <stdarg.h>
-
-void _vwarnx(const char *, va_list);
-
-void
-warnx(const char *fmt, ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- _vwarnx(eval, fmt, ap);
- va_end(ap);
-}
-
-#endif
diff --git a/lib/libc/inet/Makefile.inc b/lib/libc/inet/Makefile.inc
index 5d5ce205df1..28cf816255e 100644
--- a/lib/libc/inet/Makefile.inc
+++ b/lib/libc/inet/Makefile.inc
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.1 2004/05/20 23:13:02 christos Exp $
+# $NetBSD: Makefile.inc,v 1.2 2014/01/16 20:31:43 christos Exp $
# net sources
.PATH: ${.CURDIR}/inet
-SRCS+= _inet_aton.c _inet_pton.c inet_addr.c inet_cidr_ntop.c \
+SRCS+= inet_addr.c inet_cidr_ntop.c \
inet_cidr_pton.c inet_lnaof.c inet_makeaddr.c \
inet_net_ntop.c inet_net_pton.c inet_neta.c inet_netof.c \
inet_network.c inet_ntoa.c inet_ntop.c inet_pton.c nsap_addr.c
diff --git a/lib/libc/inet/_inet_aton.c b/lib/libc/inet/_inet_aton.c
deleted file mode 100644
index 0837a674461..00000000000
--- a/lib/libc/inet/_inet_aton.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* $NetBSD: _inet_aton.c,v 1.4 2005/09/13 01:44:09 christos Exp $ */
-
-/*
- * Written by Klaus Klein, September 14, 1999.
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _inet_aton.c,v 1.4 2005/09/13 01:44:09 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(__indr_reference)
-__indr_reference(_inet_aton, inet_aton)
-#else
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-int _inet_aton(const char *, struct in_addr *);
-
-int
-inet_aton(const char *cp, struct in_addr *addr)
-{
-
- return _inet_aton(cp, addr);
-}
-#endif
diff --git a/lib/libc/inet/_inet_pton.c b/lib/libc/inet/_inet_pton.c
deleted file mode 100644
index 7970272e5d4..00000000000
--- a/lib/libc/inet/_inet_pton.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* $NetBSD: _inet_pton.c,v 1.4 2005/09/13 01:44:09 christos Exp $ */
-
-/*
- * Written by Klaus Klein, September 14, 1999.
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _inet_pton.c,v 1.4 2005/09/13 01:44:09 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(__indr_reference)
-__indr_reference(_inet_pton, inet_pton)
-#else
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-int _inet_pton(int, const char *, void *);
-
-int
-inet_pton(int af, const char *src, void *dst)
-{
-
- return _inet_pton(af, src, dst);
-}
-#endif
diff --git a/lib/libc/resolv/Makefile.inc b/lib/libc/resolv/Makefile.inc
index 6b528292586..91bfeebf3e9 100644
--- a/lib/libc/resolv/Makefile.inc
+++ b/lib/libc/resolv/Makefile.inc
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.4 2007/01/28 02:14:05 christos Exp $
+# $NetBSD: Makefile.inc,v 1.5 2014/01/16 20:31:43 christos Exp $
# net sources
.PATH: ${.CURDIR}/resolv
CPPFLAGS+=-DCOMPAT__RES -DUSE_POLL
-SRCS+= __dn_comp.c __res_close.c __res_send.c h_errno.c \
- herror.c res_comp.c res_data.c res_debug.c \
+SRCS+= h_errno.c herror.c res_comp.c res_data.c res_debug.c \
res_init.c res_mkquery.c res_query.c res_send.c \
res_state.c mtctxres.c
# For COMPAT__RES
diff --git a/lib/libc/resolv/__dn_comp.c b/lib/libc/resolv/__dn_comp.c
deleted file mode 100644
index f8403315e86..00000000000
--- a/lib/libc/resolv/__dn_comp.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* $NetBSD: __dn_comp.c,v 1.5 2007/01/17 16:39:20 seanb Exp $ */
-
-/*
- * written by matthew green, 22/04/97.
- * public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __dn_comp.c,v 1.5 2007/01/17 16:39:20 seanb Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(__indr_reference)
-__indr_reference(__dn_comp,dn_comp)
-#else
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <resolv.h>
-
-/* XXX THIS IS A MESS! SEE <resolv.h> XXX */
-
-#undef dn_comp
-int dn_comp(const char *, u_char *, int, u_char **, u_char **);
-
-int
-dn_comp(const char *exp_dn, u_char *comp_dn, int length, u_char **dnptrs,
- u_char **lastdnptr)
-{
-
- return __dn_comp(exp_dn, comp_dn, length, dnptrs, lastdnptr);
-}
-
-#endif
diff --git a/lib/libc/resolv/__res_close.c b/lib/libc/resolv/__res_close.c
deleted file mode 100644
index 1d6d2ab235b..00000000000
--- a/lib/libc/resolv/__res_close.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* $NetBSD: __res_close.c,v 1.4 2005/09/13 01:44:10 christos Exp $ */
-
-/*
- * written by matthew green, 22/04/97.
- * public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __res_close.c,v 1.4 2005/09/13 01:44:10 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(__indr_reference)
-__indr_reference(__res_close, res_close)
-#else
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <resolv.h>
-
-/* XXX THIS IS A MESS! SEE <resolv.h> XXX */
-
-#undef res_close
-void res_close(void);
-
-void
-res_close(void)
-{
-
- __res_close();
-}
-
-#endif
diff --git a/lib/libc/resolv/__res_send.c b/lib/libc/resolv/__res_send.c
deleted file mode 100644
index af1ea36c461..00000000000
--- a/lib/libc/resolv/__res_send.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* $NetBSD: __res_send.c,v 1.4 2005/09/13 01:44:10 christos Exp $ */
-
-/*
- * written by matthew green, 22/04/97.
- * public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __res_send.c,v 1.4 2005/09/13 01:44:10 christos Exp $");
-#endif
-
-#if defined(__indr_reference)
-__indr_reference(__res_send, res_send)
-#else
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <resolv.h>
-
-/* XXX THIS IS A MESS! SEE <resolv.h> XXX */
-
-#undef res_send
-int res_send(const u_char *, int, u_char *, int);
-
-int
-res_send(const u_char *buf, int buflen, u_char *ans, int anssiz)
-{
-
- return __res_send(buf, buflen, ans, anssiz);
-}
-
-#endif
diff --git a/lib/libc/stdio/Makefile.inc b/lib/libc/stdio/Makefile.inc
index d138f91e95e..86d4342e3f6 100644
--- a/lib/libc/stdio/Makefile.inc
+++ b/lib/libc/stdio/Makefile.inc
@@ -1,5 +1,5 @@
# from: @(#)Makefile.inc 5.7 (Berkeley) 6/27/91
-# $NetBSD: Makefile.inc,v 1.42 2013/04/19 15:22:25 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.43 2014/01/16 20:31:43 christos Exp $
# stdio sources
.PATH: ${.CURDIR}/stdio
@@ -26,9 +26,6 @@ SRCS+= fmemopen.c
SRCS+= gets.c vsprintf.c tempnam.c tmpnam.c mktemp.c
.endif
-# namespace purity wrappers
-SRCS+= _fileno.c _fseeko.c _ftello.c
-
MAN+= fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetwln.3 fgetws.3 \
flockfile.3 fmemopen.3 fopen.3 fparseln.3 fputs.3 fputws.3 fread.3 \
fseek.3 funopen.3 fwide.3 getc.3 getdelim.3 getwc.3 mktemp.3 printf.3 \
diff --git a/lib/libc/stdio/_fileno.c b/lib/libc/stdio/_fileno.c
deleted file mode 100644
index 4975ecf6b51..00000000000
--- a/lib/libc/stdio/_fileno.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $NetBSD: _fileno.c,v 1.5 2009/10/21 01:07:45 snj Exp $ */
-
-/*
- * Copyright (c) 1996 Christos Zoulas. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _fileno.c,v 1.5 2009/10/21 01:07:45 snj Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(__indr_reference)
-__indr_reference(_fileno, fileno)
-#else
-
-#include <stdio.h>
-#undef fileno
-int _fileno (FILE *);
-
-int
-fileno(FILE *stream)
-{
-
- return _fileno(stream);
-}
-#endif
diff --git a/lib/libc/stdio/_fseeko.c b/lib/libc/stdio/_fseeko.c
deleted file mode 100644
index c34f17ee4cf..00000000000
--- a/lib/libc/stdio/_fseeko.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $NetBSD: _fseeko.c,v 1.5 2009/10/21 01:07:45 snj Exp $ */
-
-/*
- * Copyright (c) 1996 Christos Zoulas. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _fseeko.c,v 1.5 2009/10/21 01:07:45 snj Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(__indr_reference)
-__indr_reference(_fseeko, fseeko)
-#else
-
-#include <stdio.h>
-int _fseeko(FILE *, off_t, int);
-
-int
-fseeko(FILE *stream, off_t offset, int whence)
-{
-
- return _fseeko(stream, offset, whence);
-}
-#endif
diff --git a/lib/libc/stdio/_ftello.c b/lib/libc/stdio/_ftello.c
deleted file mode 100644
index 0004cce5780..00000000000
--- a/lib/libc/stdio/_ftello.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $NetBSD: _ftello.c,v 1.5 2009/10/21 01:07:45 snj Exp $ */
-
-/*
- * Copyright (c) 1996 Christos Zoulas. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _ftello.c,v 1.5 2009/10/21 01:07:45 snj Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(__indr_reference)
-__indr_reference(_ftello, ftello)
-#else
-
-#include <stdio.h>
-off_t _ftello(FILE *);
-
-off_t
-ftello(FILE *stream)
-{
-
- return _ftello(stream);
-}
-#endif
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index 43bee2416cd..3a036954ed9 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.221 2013/11/09 13:05:59 njoly Exp $
+# $NetBSD: Makefile.inc,v 1.222 2014/01/16 20:31:43 christos Exp $
# @(#)Makefile.inc 8.3 (Berkeley) 10/24/94
# sys sources
@@ -69,9 +69,6 @@ ASM_GLUE+= tmp___${glue:.c=}50.S
. endif
.endfor
-# namespace purity wrappers
-SRCS+= _brk.c _fork.c _getcontext.c _pipe.c _sbrk.c
-
# modules with default implementations on all architectures:
ASM= access.S acct.S \
bind.S \
diff --git a/lib/libc/sys/_brk.c b/lib/libc/sys/_brk.c
deleted file mode 100644
index b0eb0b29f70..00000000000
--- a/lib/libc/sys/_brk.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $NetBSD: _brk.c,v 1.6 2009/10/21 01:07:45 snj Exp $ */
-
-/*
- * Copyright (c) 1996 Christos Zoulas. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _brk.c,v 1.6 2009/10/21 01:07:45 snj Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(__indr_reference)
-__indr_reference(_brk, brk)
-#else
-
-#include <unistd.h>
-int _brk(void *);
-
-int
-brk(void *addr)
-{
-
- return _brk(addr);
-}
-#endif
diff --git a/lib/libc/sys/_fork.c b/lib/libc/sys/_fork.c
deleted file mode 100644
index 34a629011a0..00000000000
--- a/lib/libc/sys/_fork.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $NetBSD: _fork.c,v 1.5 2009/10/21 01:07:45 snj Exp $ */
-
-/*
- * Copyright (c) 1996 Christos Zoulas. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _fork.c,v 1.5 2009/10/21 01:07:45 snj Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(__indr_reference)
-__indr_reference(_fork, fork)
-#else
-
-#include <unistd.h>
-pid_t _fork(void);
-
-pid_t
-fork(void)
-{
-
- return _fork();
-}
-#endif
diff --git a/lib/libc/sys/_getcontext.c b/lib/libc/sys/_getcontext.c
deleted file mode 100644
index 76fd705aef6..00000000000
--- a/lib/libc/sys/_getcontext.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* $NetBSD: _getcontext.c,v 1.5 2009/10/21 01:07:45 snj Exp $ */
-
-/*
- * Copyright (c) 1996 Christos Zoulas. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _getcontext.c,v 1.5 2009/10/21 01:07:45 snj Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef __indr_reference
-__indr_reference(_getcontext, getcontext)
-#else
-#error requires either weak aliases or indirect references!
-#endif
diff --git a/lib/libc/sys/_pipe.c b/lib/libc/sys/_pipe.c
deleted file mode 100644
index a68bc189893..00000000000
--- a/lib/libc/sys/_pipe.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $NetBSD: _pipe.c,v 1.7 2009/10/21 01:07:45 snj Exp $ */
-
-/*
- * Copyright (c) 1996 Christos Zoulas. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _pipe.c,v 1.7 2009/10/21 01:07:45 snj Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(__indr_reference)
-__indr_reference(_pipe, pipe)
-#else
-
-#include <unistd.h>
-int _pipe(int *);
-
-int
-pipe(int *fildes)
-{
-
- return _pipe(fildes);
-}
-#endif
diff --git a/lib/libc/sys/_sbrk.c b/lib/libc/sys/_sbrk.c
deleted file mode 100644
index 169916adead..00000000000
--- a/lib/libc/sys/_sbrk.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $NetBSD: _sbrk.c,v 1.6 2009/10/21 01:07:45 snj Exp $ */
-
-/*
- * Copyright (c) 1996 Christos Zoulas. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _sbrk.c,v 1.6 2009/10/21 01:07:45 snj Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(__indr_reference)
-__indr_reference(_sbrk, sbrk)
-#else
-
-#include <unistd.h>
-void * _sbrk(intptr_t);
-
-void *
-sbrk(intptr_t incr)
-{
-
- return _sbrk(incr);
-}
-#endif
diff --git a/lib/libc/time/Makefile.inc b/lib/libc/time/Makefile.inc
index cc6f1f88e68..71108d2c0b6 100644
--- a/lib/libc/time/Makefile.inc
+++ b/lib/libc/time/Makefile.inc
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.17 2011/08/14 09:07:37 christos Exp $
+# $NetBSD: Makefile.inc,v 1.18 2014/01/16 20:31:43 christos Exp $
.PATH: ${.CURDIR}/time
-SRCS+= _daylight.c \
- asctime.c difftime.c localtime.c getdate.c strftime.c strptime.c
+SRCS+= asctime.c difftime.c localtime.c getdate.c strftime.c strptime.c
MAN+= ctime.3 getdate.3 offtime.3 strftime.3 strptime.3 \
time2posix.3 tzfile.5 tzset.3
CPPFLAGS+=-DALL_STATE -DUSG_COMPAT
diff --git a/lib/libc/time/_daylight.c b/lib/libc/time/_daylight.c
deleted file mode 100644
index 9f7f5fc1db0..00000000000
--- a/lib/libc/time/_daylight.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* $NetBSD: _daylight.c,v 1.4 2005/09/13 01:44:10 christos Exp $ */
-
-/*
- * Written by Klaus Klein, December 27, 2000.
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _daylight.c,v 1.4 2005/09/13 01:44:10 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(__indr_reference)
-__indr_reference(_daylight, daylight)
-#endif
-/* LINTED empty translation unit */