Source-Changes-HG archive

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

[src/trunk]: src/lib/libc/gen Move the function implementations of (the non-A...



details:   https://anonhg.NetBSD.org/src/rev/d1cfab5fb278
branches:  trunk
changeset: 476300:d1cfab5fb278
user:      kleink <kleink%NetBSD.org@localhost>
date:      Sun Sep 12 18:54:34 1999 +0000

description:
Move the function implementations of (the non-ANSI) isascii() and toascii()
into separate modules to avoid namespace clashes.

diffstat:

 lib/libc/gen/Makefile.inc |  10 ++++----
 lib/libc/gen/isascii.c    |  56 +++++++++++++++++++++++++++++++++++++++++++++++
 lib/libc/gen/isctype.c    |  20 +---------------
 lib/libc/gen/toascii.c    |  56 +++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 119 insertions(+), 23 deletions(-)

diffs (192 lines):

diff -r df7d4bd78002 -r d1cfab5fb278 lib/libc/gen/Makefile.inc
--- a/lib/libc/gen/Makefile.inc Sun Sep 12 18:47:10 1999 +0000
+++ b/lib/libc/gen/Makefile.inc Sun Sep 12 18:54:34 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.99 1999/05/01 22:45:57 ross Exp $
+#      $NetBSD: Makefile.inc,v 1.100 1999/09/12 18:54:34 kleink Exp $
 #      from: @(#)Makefile.inc  8.6 (Berkeley) 5/4/95
 
 # gen sources
@@ -12,7 +12,7 @@
        getdomainname.c getgrent.c getgrouplist.c gethostname.c \
        getloadavg.c getlogin.c getmntinfo.c getnetgrent.c \
        getpagesize.c getpass.c getpwent.c getsubopt.c getttyent.c \
-       getusershell.c __glob13.c glob.c initgroups.c isatty.c \
+       getusershell.c __glob13.c glob.c initgroups.c isascii.c isatty.c \
        isctype.c lockf.c nice.c nlist.c nlist_aout.c \
        nlist_ecoff.c nlist_elf32.c nlist_elf64.c opendir.c \
        pause.c popen.c psignal.c pwcache.c pw_scan.c raise.c readdir.c \
@@ -21,9 +21,9 @@
        siginterrupt.c __siglist14.c siglist.c signal.c \
        __signame14.c signame.c __sigsetops14.c sigsetops.c sleep.c \
        stringlist.c sysconf.c sysctl.c syslog.c telldir.c time.c times.c \
-       timezone.c tolower_.c ttyname.c ttyslot.c toupper_.c ualarm.c uname.c \
-       unvis.c usleep.c utime.c valloc.c vis.c wait.c wait3.c waitpid.c \
-       warn.c warnx.c vwarn.c vwarnx.c verr.c verrx.c
+       timezone.c toascii.c tolower_.c ttyname.c ttyslot.c toupper_.c \
+       ualarm.c uname.c unvis.c usleep.c utime.c valloc.c vis.c wait.c \
+       wait3.c waitpid.c warn.c warnx.c vwarn.c vwarnx.c verr.c verrx.c
 
 # indirect reference stubs, to be removed soon.
 SRCS+= _err.c _errx.c _sys_errlist.c _sys_nerr.c _sys_siglist.c \
diff -r df7d4bd78002 -r d1cfab5fb278 lib/libc/gen/isascii.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/libc/gen/isascii.c    Sun Sep 12 18:54:34 1999 +0000
@@ -0,0 +1,56 @@
+/*     $NetBSD: isascii.c,v 1.1 1999/09/12 18:54:34 kleink Exp $       */
+
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ *
+ *     from:   @(#)isctype.c   5.2 (Berkeley) 6/1/90
+ */
+
+#include <sys/cdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: isascii.c,v 1.1 1999/09/12 18:54:34 kleink Exp $");
+#endif /* LIBC_SCCS and not lint */
+
+#include <ctype.h>
+
+#undef isascii
+int
+isascii(c)
+       int c;
+{
+       return ((unsigned)(c) <= 0177);
+}
diff -r df7d4bd78002 -r d1cfab5fb278 lib/libc/gen/isctype.c
--- a/lib/libc/gen/isctype.c    Sun Sep 12 18:47:10 1999 +0000
+++ b/lib/libc/gen/isctype.c    Sun Sep 12 18:54:34 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isctype.c,v 1.14 1997/07/13 19:46:04 christos Exp $    */
+/*     $NetBSD: isctype.c,v 1.15 1999/09/12 18:54:34 kleink Exp $      */
 
 /*
  * Copyright (c) 1989 The Regents of the University of California.
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)isctype.c  5.2 (Berkeley) 6/1/90";
 #else
-__RCSID("$NetBSD: isctype.c,v 1.14 1997/07/13 19:46:04 christos Exp $");
+__RCSID("$NetBSD: isctype.c,v 1.15 1999/09/12 18:54:34 kleink Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -146,22 +146,6 @@
        return((_ctype_ + 1)[c] & (_N|_X));
 }
 
-#undef isascii
-int
-isascii(c)
-       int c;
-{
-       return ((unsigned)(c) <= 0177);
-}
-
-#undef toascii
-int
-toascii(c)
-       int c;
-{
-       return ((c) & 0177);
-}
-
 #undef _toupper
 int
 _toupper(c)
diff -r df7d4bd78002 -r d1cfab5fb278 lib/libc/gen/toascii.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/libc/gen/toascii.c    Sun Sep 12 18:54:34 1999 +0000
@@ -0,0 +1,56 @@
+/*     $NetBSD: toascii.c,v 1.1 1999/09/12 18:54:34 kleink Exp $       */
+
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ *
+ *     from:   @(#)isctype.c   5.2 (Berkeley) 6/1/90
+ */
+
+#include <sys/cdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: toascii.c,v 1.1 1999/09/12 18:54:34 kleink Exp $");
+#endif /* LIBC_SCCS and not lint */
+
+#include <ctype.h>
+
+#undef toascii
+int
+toascii(c)
+       int c;
+{
+       return ((c) & 0177);
+}



Home | Main Index | Thread Index | Old Index