[src/trunk]: src/lib/libc/string GC __indr_reference wrappers.

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b9d80ea975dd
branches:  trunk
changeset: 789458:b9d80ea975dd
user:      joerg <joerg%NetBSD.org@localhost>
date:      Mon Aug 19 10:59:39 2013 +0000

description:
GC __indr_reference wrappers.

diffstat:

 lib/libc/string/Makefile.inc  |   5 +---
 lib/libc/string/_strerror_r.c |  49 -------------------------------------------
 lib/libc/string/_strlcat.c    |  45 ---------------------------------------
 lib/libc/string/_strlcpy.c    |  45 ---------------------------------------
 4 files changed, 1 insertions(+), 143 deletions(-)

diffs (171 lines):

diff -r b09d2c085713 -r b9d80ea975dd lib/libc/string/Makefile.inc
--- a/lib/libc/string/Makefile.inc      Mon Aug 19 09:12:58 2013 +0000
+++ b/lib/libc/string/Makefile.inc      Mon Aug 19 10:59:39 2013 +0000
@@ -1,5 +1,5 @@
 #      from: @(#)Makefile.inc  8.1 (Berkeley) 6/4/93
-#      $NetBSD: Makefile.inc,v 1.78 2013/06/24 04:21:20 riastradh Exp $
+#      $NetBSD: Makefile.inc,v 1.79 2013/08/19 10:59:39 joerg Exp $
 
 # string sources
 .PATH: ${ARCHDIR}/string ${.CURDIR}/string
@@ -34,9 +34,6 @@
 CPPFLAGS.wcsncmp.c+=   -I${LIBCDIR}/locale
 CPPFLAGS.wmemcmp.c+=   -I${LIBCDIR}/locale
 
-# namespace protection wrappers
-SRCS+= _strlcat.c _strlcpy.c _strerror_r.c
-
 .include "${ARCHDIR}/string/Makefile.inc"
 
 MAN+=  bm.3 bcmp.3 bcopy.3 bstring.3 bzero.3 consttime_memequal.3 \
diff -r b09d2c085713 -r b9d80ea975dd lib/libc/string/_strerror_r.c
--- a/lib/libc/string/_strerror_r.c     Mon Aug 19 09:12:58 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*     $NetBSD: _strerror_r.c,v 1.3 2008/04/28 20:23:00 martin Exp $   */
-
-/*-
- * Copyright (c) 2005 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``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 FOUNDATION OR CONTRIBUTORS
- * 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: _strerror_r.c,v 1.3 2008/04/28 20:23:00 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(__indr_reference)
-__indr_reference(_strerror_r, strerror_r)
-#else
-
-#include <string.h>
-int    _strerror_r(int, char *, size_t);
-
-int
-strerror_r(int num, char *buf, size_t siz)
-{
-
-       return _strerror_r(num, buf, siz);
-}
-#endif
diff -r b09d2c085713 -r b9d80ea975dd lib/libc/string/_strlcat.c
--- a/lib/libc/string/_strlcat.c        Mon Aug 19 09:12:58 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/*     $NetBSD: _strlcat.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: _strlcat.c,v 1.5 2009/10/21 01:07:45 snj Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(__indr_reference)
-__indr_reference(_strlcat, strlcat)
-#else
-
-#include <string.h>
-size_t _strlcat(char *, const char *, size_t);
-
-size_t
-strlcat(char *dst, const char *src, size_t siz)
-{
-
-       return _strlcat(dst, src, siz);
-}
-#endif
diff -r b09d2c085713 -r b9d80ea975dd lib/libc/string/_strlcpy.c
--- a/lib/libc/string/_strlcpy.c        Mon Aug 19 09:12:58 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/*     $NetBSD: _strlcpy.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: _strlcpy.c,v 1.5 2009/10/21 01:07:45 snj Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(__indr_reference)
-__indr_reference(_strlcpy, strlcpy)
-#else
-
-#include <string.h>
-size_t _strlcpy(char *, const char *, size_t);
-
-size_t
-strlcpy(char *dst, const char *src, size_t siz)
-{
-
-       return _strlcpy(dst, src, siz);
-}
-#endif