From 353207c9dce0611f122e7d09539123ea4789b50b Mon Sep 17 00:00:00 2001 From: tedu <> Date: Sun, 23 Mar 2014 23:41:31 +0000 Subject: [PATCH] more bm excision --- src/include/Makefile | 4 ++-- src/include/bm.h | 57 -------------------------------------------- 2 files changed, 2 insertions(+), 59 deletions(-) delete mode 100644 src/include/bm.h diff --git a/src/include/Makefile b/src/include/Makefile index 46a9d2d8..c7bfbd8a 100644 --- a/src/include/Makefile +++ b/src/include/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.183 2014/03/23 23:27:22 naddy Exp $ +# $OpenBSD: Makefile,v 1.184 2014/03/23 23:41:31 tedu Exp $ # $NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $ # @(#)Makefile 5.45.1.1 (Berkeley) 5/6/91 @@ -9,7 +9,7 @@ .include -FILES= a.out.h ar.h assert.h bitstring.h blf.h bm.h bsd_auth.h \ +FILES= a.out.h ar.h assert.h bitstring.h blf.h bsd_auth.h \ complex.h cpio.h ctype.h curses.h db.h dbm.h des.h dirent.h disktab.h \ dlfcn.h elf_abi.h err.h errno.h fenv.h float.h fnmatch.h fstab.h fts.h \ ftw.h getopt.h glob.h grp.h ifaddrs.h inttypes.h iso646.h kvm.h \ diff --git a/src/include/bm.h b/src/include/bm.h deleted file mode 100644 index 1cec4d50..00000000 --- a/src/include/bm.h +++ /dev/null @@ -1,57 +0,0 @@ -/* $OpenBSD: bm.h,v 1.9 2012/12/05 23:19:57 deraadt Exp $ */ -/* $NetBSD: bm.h,v 1.3 1994/10/26 00:55:46 cgd Exp $ */ - -/*- - * Copyright (c) 1994 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Andrew Hume of AT&T Bell Laboratories. - * - * 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. 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. - * - * @(#)bm.h 8.6 (Berkeley) 6/21/94 - */ - -#ifndef _BM_H_ -#define _BM_H_ - -typedef struct { - unsigned char *pat; /* pattern */ - size_t patlen; /* pattern length */ - size_t *delta; /* skip delta */ - int rarec; /* rare character */ - size_t rareoff; /* rare offset */ - size_t md2; /* mini delta */ -} bm_pat; - -__BEGIN_DECLS -bm_pat *bm_comp(unsigned char const *, size_t, unsigned char const *); -unsigned char *bm_exec(bm_pat *, unsigned char *, size_t) - __attribute__ ((__bounded__(__string__,2,3))); -void bm_free(bm_pat *); -__END_DECLS - -#endif /* !_BM_H_ */