From e534d351c60f7ed7cb9253436d4589bcbb9f6e65 Mon Sep 17 00:00:00 2001 From: millert Date: Mon, 5 May 1997 14:31:41 +0000 Subject: [PATCH] Several kernel files have internal (conflicting) versions of strchr() so move to libsa for now. --- sys/lib/libkern/arch/alpha/Makefile.inc | 4 +- sys/lib/libkern/strchr.c | 57 ------------------------- 2 files changed, 2 insertions(+), 59 deletions(-) delete mode 100644 sys/lib/libkern/strchr.c diff --git a/sys/lib/libkern/arch/alpha/Makefile.inc b/sys/lib/libkern/arch/alpha/Makefile.inc index ae62cf3262e..ce0e0bcf1ba 100644 --- a/sys/lib/libkern/arch/alpha/Makefile.inc +++ b/sys/lib/libkern/arch/alpha/Makefile.inc @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile.inc,v 1.6 1997/05/04 23:33:41 millert Exp $ +# $OpenBSD: Makefile.inc,v 1.7 1997/05/05 14:31:43 millert Exp $ # $NetBSD: Makefile.inc,v 1.9 1996/08/27 00:44:24 cgd Exp $ SRCS+= __main.c imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c \ bcmp.c bzero.S ffs.S strcat.c strcmp.c strcpy.c strlen.c strncmp.c \ strncpy.c scanc.c skpc.c htonl.S htons.S ntohl.S ntohs.S \ - random.c strncasecmp.c strchr.c + random.c strncasecmp.c # `source' files built from m4 source SRCS+= __divqu.S __divq.S __divlu.S __divl.S diff --git a/sys/lib/libkern/strchr.c b/sys/lib/libkern/strchr.c deleted file mode 100644 index a32db3e0b94..00000000000 --- a/sys/lib/libkern/strchr.c +++ /dev/null @@ -1,57 +0,0 @@ -/* $OpenBSD: strchr.c,v 1.1 1997/05/04 23:33:39 millert Exp $ */ - -/*- - * Copyright (c) 1990 The Regents of the University of California. - * 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. - * 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. - */ - -#if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: strchr.c,v 1.1 1997/05/04 23:33:39 millert Exp $"; -#endif /* LIBC_SCCS and not lint */ - -#ifndef _KERNEL -#include -#else -#include -#endif - -char * -strchr(p, ch) - register const char *p, ch; -{ - for (;; ++p) { - if (*p == ch) - return((char *)p); - if (!*p) - return((char *)NULL); - } - /* NOTREACHED */ -} -- 2.20.1