Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/libc "soon" is "now". Remove all __indr_reference crap.



details:   https://anonhg.NetBSD.org/src/rev/70ea07d6b1c4
branches:  trunk
changeset: 326047:70ea07d6b1c4
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jan 16 20:31:42 2014 +0000

description:
"soon" is "now". Remove all __indr_reference crap.

diffstat:

 lib/libc/compat/gen/Makefile.inc          |   3 +-
 lib/libc/compat/gen/compat__sys_errlist.c |  45 -------------------------
 lib/libc/compat/gen/compat__sys_nerr.c    |  17 ---------
 lib/libc/compat/gen/compat__sys_siglist.c |  35 --------------------
 lib/libc/gdtoa/Makefile.inc               |   6 +--
 lib/libc/gdtoa/_strtof.c                  |  54 -------------------------------
 lib/libc/gdtoa/_strtold.c                 |  45 -------------------------
 lib/libc/gen/Makefile.inc                 |   7 +---
 lib/libc/gen/_err.c                       |  30 -----------------
 lib/libc/gen/_errc.c                      |  30 -----------------
 lib/libc/gen/_errx.c                      |  30 -----------------
 lib/libc/gen/_sysconf.c                   |  45 -------------------------
 lib/libc/gen/_verr.c                      |  27 ---------------
 lib/libc/gen/_verrc.c                     |  27 ---------------
 lib/libc/gen/_verrx.c                     |  27 ---------------
 lib/libc/gen/_vwarn.c                     |  27 ---------------
 lib/libc/gen/_vwarnc.c                    |  27 ---------------
 lib/libc/gen/_vwarnx.c                    |  27 ---------------
 lib/libc/gen/_warn.c                      |  30 -----------------
 lib/libc/gen/_warnc.c                     |  30 -----------------
 lib/libc/gen/_warnx.c                     |  31 -----------------
 lib/libc/inet/Makefile.inc                |   4 +-
 lib/libc/inet/_inet_aton.c                |  29 ----------------
 lib/libc/inet/_inet_pton.c                |  29 ----------------
 lib/libc/resolv/Makefile.inc              |   5 +-
 lib/libc/resolv/__dn_comp.c               |  34 -------------------
 lib/libc/resolv/__res_close.c             |  33 ------------------
 lib/libc/resolv/__res_send.c              |  33 ------------------
 lib/libc/stdio/Makefile.inc               |   5 +--
 lib/libc/stdio/_fileno.c                  |  46 --------------------------
 lib/libc/stdio/_fseeko.c                  |  45 -------------------------
 lib/libc/stdio/_ftello.c                  |  45 -------------------------
 lib/libc/sys/Makefile.inc                 |   5 +--
 lib/libc/sys/_brk.c                       |  45 -------------------------
 lib/libc/sys/_fork.c                      |  45 -------------------------
 lib/libc/sys/_getcontext.c                |  36 --------------------
 lib/libc/sys/_pipe.c                      |  45 -------------------------
 lib/libc/sys/_sbrk.c                      |  45 -------------------------
 lib/libc/time/Makefile.inc                |   5 +-
 lib/libc/time/_daylight.c                 |  16 ---------
 40 files changed, 11 insertions(+), 1139 deletions(-)

diffs (truncated from 1382 to 300 lines):

diff -r 98df7f4c28fc -r 70ea07d6b1c4 lib/libc/compat/gen/Makefile.inc
--- a/lib/libc/compat/gen/Makefile.inc  Thu Jan 16 20:31:18 2014 +0000
+++ b/lib/libc/compat/gen/Makefile.inc  Thu Jan 16 20:31:42 2014 +0000
@@ -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 @@
     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 -r 98df7f4c28fc -r 70ea07d6b1c4 lib/libc/compat/gen/compat__sys_errlist.c
--- a/lib/libc/compat/gen/compat__sys_errlist.c Thu Jan 16 20:31:18 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 98df7f4c28fc -r 70ea07d6b1c4 lib/libc/compat/gen/compat__sys_nerr.c
--- a/lib/libc/compat/gen/compat__sys_nerr.c    Thu Jan 16 20:31:18 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 98df7f4c28fc -r 70ea07d6b1c4 lib/libc/compat/gen/compat__sys_siglist.c
--- a/lib/libc/compat/gen/compat__sys_siglist.c Thu Jan 16 20:31:18 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 98df7f4c28fc -r 70ea07d6b1c4 lib/libc/gdtoa/Makefile.inc
--- a/lib/libc/gdtoa/Makefile.inc       Thu Jan 16 20:31:18 2014 +0000
+++ b/lib/libc/gdtoa/Makefile.inc       Thu Jan 16 20:31:42 2014 +0000
@@ -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 @@
        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 -r 98df7f4c28fc -r 70ea07d6b1c4 lib/libc/gdtoa/_strtof.c
--- a/lib/libc/gdtoa/_strtof.c  Thu Jan 16 20:31:18 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 98df7f4c28fc -r 70ea07d6b1c4 lib/libc/gdtoa/_strtold.c
--- a/lib/libc/gdtoa/_strtold.c Thu Jan 16 20:31:18 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 98df7f4c28fc -r 70ea07d6b1c4 lib/libc/gen/Makefile.inc
--- a/lib/libc/gen/Makefile.inc Thu Jan 16 20:31:18 2014 +0000
+++ b/lib/libc/gen/Makefile.inc Thu Jan 16 20:31:42 2014 +0000
@@ -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 @@
        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 -r 98df7f4c28fc -r 70ea07d6b1c4 lib/libc/gen/_err.c
--- a/lib/libc/gen/_err.c       Thu Jan 16 20:31:18 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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, ...)



Home | Main Index | Thread Index | Old Index