From ea03112dbfc5c3e2bd1036cae5b8a2bbd59bcefc Mon Sep 17 00:00:00 2001 From: robert Date: Wed, 16 Oct 2002 14:00:46 +0000 Subject: - Remove the old insque() and remque() functions and their manual page from the compatibility library. - Add new implementations of insque() and remque() which conform to IEEE Std 1003.1-2001 to libc. Add a new manual page for them and connect them to the build. - Add the prototypes of insque() and remque() to the search.h header. --- lib/libcompat/4.3/insque.3 | 89 ---------------------------------------------- lib/libcompat/4.3/insque.c | 59 ------------------------------ lib/libcompat/4.3/remque.c | 57 ----------------------------- lib/libcompat/Makefile | 4 +-- 4 files changed, 1 insertion(+), 208 deletions(-) delete mode 100644 lib/libcompat/4.3/insque.3 delete mode 100644 lib/libcompat/4.3/insque.c delete mode 100644 lib/libcompat/4.3/remque.c (limited to 'lib/libcompat') diff --git a/lib/libcompat/4.3/insque.3 b/lib/libcompat/4.3/insque.3 deleted file mode 100644 index 2744dae..0000000 --- a/lib/libcompat/4.3/insque.3 +++ /dev/null @@ -1,89 +0,0 @@ -.\" Copyright (c) 1983, 1991, 1993 -.\" 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. -.\" -.\" @(#)insque.3 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD$ -.\" -.Dd December 11, 1993 -.Dt INSQUE 3 -.Os -.Sh NAME -.Nm insque , -.Nm remque -.Nd insert/remove element from a queue -.Sh LIBRARY -.Lb libcompat -.Sh SYNOPSIS -.Bd -literal -struct qelem { - struct qelem *q_forw; - struct qelem *q_back; - char q_data[]; -}; -.Ed -.Pp -.Ft void -.Fn insque "struct qelem *elem" "struct qelem *pred" -.Ft void -.Fn remque "struct qelem *elem" -.Sh DESCRIPTION -.Bf -symbolic -The insque and remque functions are considered obsolete. -.Ef -.Pp -The -.Fn insque -and -.Fn remque -functions -manipulate queues built from doubly linked lists. Each -element in the queue must be in the form of -.Dq Li struct qelem . -The function -.Fn insque -inserts -.Fa elem -in a queue immediately after -.Fa pred ; -.Fn remque -removes an entry -.Fa elem -from a queue. -.Sh SEE ALSO -.%T "VAX Architecture Handbook" , -pp. 228-235. -.Sh HISTORY -The -.Fn insque -and -.Fn remque -functions appeared in -.Bx 4.2 . diff --git a/lib/libcompat/4.3/insque.c b/lib/libcompat/4.3/insque.c deleted file mode 100644 index d290860..0000000 --- a/lib/libcompat/4.3/insque.c +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 1987, 1993 - * 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 sccsid[] = "@(#)insque.c 8.1 (Berkeley) 6/4/93"; -#endif /* LIBC_SCCS and not lint */ -#include -__FBSDID("$FreeBSD$"); - -/* - * insque -- vax insque instruction - * - * NOTE: this implementation is non-atomic!! - */ - -struct vaxque { /* queue format expected by VAX queue instructions */ - struct vaxque *vq_next; - struct vaxque *vq_prev; -}; - -void -insque(e, prev) - struct vaxque *e, *prev; -{ - e->vq_prev = prev; - e->vq_next = prev->vq_next; - prev->vq_next->vq_prev = e; - prev->vq_next = e; -} diff --git a/lib/libcompat/4.3/remque.c b/lib/libcompat/4.3/remque.c deleted file mode 100644 index b57046c..0000000 --- a/lib/libcompat/4.3/remque.c +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 1987, 1993 - * 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 sccsid[] = "@(#)remque.c 8.1 (Berkeley) 6/4/93"; -#endif /* LIBC_SCCS and not lint */ -#include -__FBSDID("$FreeBSD$"); - -/* - * remque -- vax remque instruction - * - * NOTE: this implementation is non-atomic!! - */ - -struct vaxque { /* queue format expected by VAX queue instructions */ - struct vaxque *vq_next; - struct vaxque *vq_prev; -}; - -void -remque(e) - struct vaxque *e; -{ - e->vq_prev->vq_next = e->vq_next; - e->vq_next->vq_prev = e->vq_prev; -} diff --git a/lib/libcompat/Makefile b/lib/libcompat/Makefile index 668f7b6..bd1dd9e 100644 --- a/lib/libcompat/Makefile +++ b/lib/libcompat/Makefile @@ -24,14 +24,12 @@ MLINKS+=cftime.3 ascftime.3 # compat 4.3 sources # XXX MISSING: ecvt.c gcvt.c sibuf.c sobuf.c strout.c SRCS+= cfree.c lsearch.c regex.c rexec.c -SRCS+= insque.c remque.c # XXX MISSING: ecvt.0 -MAN+= 4.3/cfree.3 4.3/insque.3 4.3/lsearch.3 4.3/re_comp.3 4.3/rexec.3 +MAN+= 4.3/cfree.3 4.3/lsearch.3 4.3/re_comp.3 4.3/rexec.3 # XXX MISSING: ecvt.3, so can't MLINK #MLINKS+=ecvt.3 fcvt.3 ecvt.3 gcvt.3 -MLINKS+=insque.3 remque.3 MLINKS+=re_comp.3 re_exec.3 MLINKS+=lsearch.3 lfind.3 -- cgit v1.1