Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/lib/libcompat Don't provide 2 versions of __compat_regerror(...
details: https://anonhg.NetBSD.org/src/rev/7ad4e286ce8e
branches: trunk
changeset: 784732:7ad4e286ce8e
user: christos <christos%NetBSD.org@localhost>
date: Thu Feb 07 20:15:07 2013 +0000
description:
Don't provide 2 versions of __compat_regerror() (the other one comes
from 4.3/regex.c via symbol renaming). Anyway this one did nada, so
no great loss :-)
diffstat:
lib/libcompat/Makefile | 4 ++--
lib/libcompat/regexp/regerror.c | 28 ----------------------------
2 files changed, 2 insertions(+), 30 deletions(-)
diffs (50 lines):
diff -r bf478739b57f -r 7ad4e286ce8e lib/libcompat/Makefile
--- a/lib/libcompat/Makefile Thu Feb 07 19:32:19 2013 +0000
+++ b/lib/libcompat/Makefile Thu Feb 07 20:15:07 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2012/03/21 10:08:30 matt Exp $
+# $NetBSD: Makefile,v 1.32 2013/02/07 20:15:07 christos Exp $
.include <bsd.own.mk>
@@ -46,7 +46,7 @@
# regexp sources
-SRCS+= regerror.c regexp.c regsub.c
+SRCS+= regexp.c regsub.c
MAN+= regexp.3
.include <bsd.lib.mk>
diff -r bf478739b57f -r 7ad4e286ce8e lib/libcompat/regexp/regerror.c
--- a/lib/libcompat/regexp/regerror.c Thu Feb 07 19:32:19 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: regerror.c,v 1.9 2000/09/14 01:24:32 msaitoh Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <regexp.h>
-#include <stdio.h>
-
-/*ARGSUSED*/
-void
-__compat_regerror(s)
-const char *s;
-{
-
- _DIAGASSERT(s != NULL);
-
-#ifdef ERRAVAIL
- error("regexp: %s", s);
-#else
-/*
- fprintf(stderr, "regexp(3): %s\n", s);
- exit(1);
-*/
- return; /* let std. egrep handle errors */
-#endif
- /* NOTREACHED */
-}
Home |
Main Index |
Thread Index |
Old Index