summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2013-12-11 01:24:08 +0000
committerjoerg <joerg@NetBSD.org>2013-12-11 01:24:08 +0000
commit8a05e9a38d7cbb7726fc62dc486cee1896bb5173 (patch)
tree90560bb06ba1978751f965d7585e4754764621aa /include
parent82b90e35a45c68a97cac0e7d83a6905c2e29c8b7 (diff)
Allow kernel code to access constant databases by moving cdbr(3) and the
required mi_vector_hash(3) into src/common.
Diffstat (limited to 'include')
-rw-r--r--include/Makefile4
-rw-r--r--include/cdbr.h58
2 files changed, 2 insertions, 60 deletions
diff --git a/include/Makefile b/include/Makefile
index 54dbafef1bc..0f94a2feefa 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.139 2012/02/11 23:31:24 martin Exp $
+# $NetBSD: Makefile,v 1.140 2013/12/11 01:24:08 joerg Exp $
# @(#)Makefile 8.2 (Berkeley) 1/4/94
# Doing a make includes builds /usr/include
@@ -8,7 +8,7 @@ NOOBJ= # defined
# Missing: mp.h
INCS= a.out.h aio.h ar.h assert.h atomic.h \
- bitstring.h bm.h cdbr.h cdbw.h complex.h cpio.h ctype.h \
+ bitstring.h bm.h cdbw.h complex.h cpio.h ctype.h \
db.h dirent.h disktab.h dlfcn.h err.h errno.h fenv.h fmtmsg.h fnmatch.h \
fstab.h fts.h ftw.h getopt.h glob.h grp.h ifaddrs.h iconv.h \
inttypes.h iso646.h kvm.h langinfo.h libgen.h \
diff --git a/include/cdbr.h b/include/cdbr.h
deleted file mode 100644
index b0f602d77e2..00000000000
--- a/include/cdbr.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* $NetBSD: cdbr.h,v 1.2 2013/12/05 21:17:23 joerg Exp $ */
-/*-
- * Copyright (c) 2010 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Joerg Sonnenberger.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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
- * COPYRIGHT HOLDERS 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.
- */
-
-#ifndef _CDBR_H
-#define _CDBR_H
-
-#include <sys/cdefs.h>
-#include <inttypes.h>
-#include <stddef.h>
-
-#define CDBR_DEFAULT 0
-
-struct cdbr;
-
-__BEGIN_DECLS
-
-struct cdbr *cdbr_open(const char *, int);
-struct cdbr *cdbr_open_mem(void *, size_t, int,
- void (*)(void *, void *, size_t), void *);
-uint32_t cdbr_entries(struct cdbr *);
-int cdbr_get(struct cdbr *, uint32_t, const void **, size_t *);
-int cdbr_find(struct cdbr *, const void *, size_t,
- const void **, size_t *);
-void cdbr_close(struct cdbr *);
-
-__END_DECLS
-
-#endif /* _CDBR_H */