pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/pkgtools/libnbcompat
Module Name: pkgsrc
Committed By: nia
Date: Wed Oct 29 15:39:26 UTC 2025
Modified Files:
pkgsrc/pkgtools/libnbcompat: Makefile
pkgsrc/pkgtools/libnbcompat/files: README __fts13.c __glob13.c
getaddrinfo.c
pkgsrc/pkgtools/libnbcompat/files/db/btree: bt_close.c bt_delete.c
bt_get.c bt_overflow.c bt_put.c bt_seq.c bt_utils.c btree.h
pkgsrc/pkgtools/libnbcompat/files/db/db: db.c
pkgsrc/pkgtools/libnbcompat/files/db/hash: extern.h hash.c hash.h
hash_bigkey.c hash_buf.c ndbmdatum.c
pkgsrc/pkgtools/libnbcompat/files/db/mpool: mpool.c
pkgsrc/pkgtools/libnbcompat/files/db/recno: extern.h rec_close.c
rec_delete.c rec_get.c rec_open.c rec_put.c rec_seq.c rec_utils.c
pkgsrc/pkgtools/libnbcompat/files/nbcompat: db.h
Log Message:
libnbcompat: Update to 20251029
This is the result of porting libnbcompat to Sortix, a hobby operating
system. Sortix is a relatively clean "legacy-free" POSIX implementation,
so the port revealed lots of historical Unix warts and BSDisms in
libnbcompat. These included:
- gratuitous use of <sys/param.h>, which is probably mostly unnecessary
and cargo-culted (but libnbcompat is supposed to implement the header
anyway, so use its internal copy)
- BSDisms: frequent use of u_int, u_long, caddr_t types
- other portability problems: for some reason, only defining MAXPATHLEN
if missing on SCO
Verified to compile on a whole heap of platforms, see README for gory
details...
To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 pkgsrc/pkgtools/libnbcompat/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/pkgtools/libnbcompat/files/README
cvs rdiff -u -r1.11 -r1.12 pkgsrc/pkgtools/libnbcompat/files/__fts13.c
cvs rdiff -u -r1.5 -r1.6 pkgsrc/pkgtools/libnbcompat/files/__glob13.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/pkgtools/libnbcompat/files/getaddrinfo.c
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_close.c \
pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_delete.c \
pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_get.c \
pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_overflow.c \
pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_put.c
cvs rdiff -u -r1.2 -r1.3 pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_seq.c \
pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_utils.c
cvs rdiff -u -r1.4 -r1.5 pkgsrc/pkgtools/libnbcompat/files/db/btree/btree.h
cvs rdiff -u -r1.3 -r1.4 pkgsrc/pkgtools/libnbcompat/files/db/db/db.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/pkgtools/libnbcompat/files/db/hash/extern.h \
pkgsrc/pkgtools/libnbcompat/files/db/hash/hash_bigkey.c \
pkgsrc/pkgtools/libnbcompat/files/db/hash/hash_buf.c
cvs rdiff -u -r1.4 -r1.5 pkgsrc/pkgtools/libnbcompat/files/db/hash/hash.c
cvs rdiff -u -r1.3 -r1.4 pkgsrc/pkgtools/libnbcompat/files/db/hash/hash.h
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/pkgtools/libnbcompat/files/db/hash/ndbmdatum.c
cvs rdiff -u -r1.6 -r1.7 pkgsrc/pkgtools/libnbcompat/files/db/mpool/mpool.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/pkgtools/libnbcompat/files/db/recno/extern.h \
pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_delete.c \
pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_get.c \
pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_put.c \
pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_seq.c \
pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_utils.c
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_close.c
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_open.c
cvs rdiff -u -r1.4 -r1.5 pkgsrc/pkgtools/libnbcompat/files/nbcompat/db.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/pkgtools/libnbcompat/Makefile
diff -u pkgsrc/pkgtools/libnbcompat/Makefile:1.96 pkgsrc/pkgtools/libnbcompat/Makefile:1.97
--- pkgsrc/pkgtools/libnbcompat/Makefile:1.96 Wed Mar 5 11:54:23 2025
+++ pkgsrc/pkgtools/libnbcompat/Makefile Wed Oct 29 15:39:25 2025
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.96 2025/03/05 11:54:23 nia Exp $
+# $NetBSD: Makefile,v 1.97 2025/10/29 15:39:25 nia Exp $
#
# NOTE: If you update this package, it is *mandatory* that you update
# pkgsrc/pkgtools/libnbcompat/files/README to reflect the actual
# list of tested and supported platforms.
#
-PKGNAME= libnbcompat-20250303
+PKGNAME= libnbcompat-20251029
CATEGORIES= pkgtools devel
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
Index: pkgsrc/pkgtools/libnbcompat/files/README
diff -u pkgsrc/pkgtools/libnbcompat/files/README:1.32 pkgsrc/pkgtools/libnbcompat/files/README:1.33
--- pkgsrc/pkgtools/libnbcompat/files/README:1.32 Wed Mar 5 11:54:23 2025
+++ pkgsrc/pkgtools/libnbcompat/files/README Wed Oct 29 15:39:25 2025
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.32 2025/03/05 11:54:23 nia Exp $
+$NetBSD: README,v 1.33 2025/10/29 15:39:25 nia Exp $
0 Introduction
==============
@@ -54,6 +54,19 @@ on the following operating systems:
FreeBSD/amd64 14.2 <nia%NetBSD.org@localhost>
OpenBSD/amd64 7.6 <nia%NetBSD.org@localhost>
+libnbcompat-20251029 has been tested to build and install correctly
+on the following operating systems:
+
+ FreeBSD/amd64 14.2 <nia%NetBSD.org@localhost>
+ NetBSD/amd64 10.1 <nia%NetBSD.org@localhost>
+ OpenBSD/amd64 7.6 <nia%NetBSD.org@localhost>
+ Darwin/aarch64 15 <nia%NetBSD.org@localhost>
+ Darwin/x86_64 13 <nia%NetBSD.org@localhost>
+ Cygwin/x86_64 2022 <nia%NetBSD.org@localhost>
+ Sortix/x86_64 Nightly <nia%NetBSD.org@localhost>
+ Linux/x86_64 Ubuntu 24.04 <nia%NetBSD.org@localhost>
+ SmartOS/x86_64 24 <nia%NetBSD.org@localhost>
+
libnbcompat-20240805 has been tested to build and install correctly
on the following operating systems:
Index: pkgsrc/pkgtools/libnbcompat/files/__fts13.c
diff -u pkgsrc/pkgtools/libnbcompat/files/__fts13.c:1.11 pkgsrc/pkgtools/libnbcompat/files/__fts13.c:1.12
--- pkgsrc/pkgtools/libnbcompat/files/__fts13.c:1.11 Fri Mar 14 22:08:17 2014
+++ pkgsrc/pkgtools/libnbcompat/files/__fts13.c Wed Oct 29 15:39:25 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: __fts13.c,v 1.11 2014/03/14 22:08:17 ryoon Exp $ */
+/* $NetBSD: __fts13.c,v 1.12 2025/10/29 15:39:25 nia Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#else
-__RCSID("$NetBSD: __fts13.c,v 1.11 2014/03/14 22:08:17 ryoon Exp $");
+__RCSID("$NetBSD: __fts13.c,v 1.12 2025/10/29 15:39:25 nia Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -73,10 +73,8 @@ __RCSID("$NetBSD: __fts13.c,v 1.11 2014/
* in limits.h. But it is not usable under ordinal condition.
*/
#if !defined(MAXPATHLEN)
-#if defined(_SCO_DS)
#define MAXPATHLEN 1024
#endif
-#endif
#if 0
#ifdef __weak_alias
Index: pkgsrc/pkgtools/libnbcompat/files/__glob13.c
diff -u pkgsrc/pkgtools/libnbcompat/files/__glob13.c:1.5 pkgsrc/pkgtools/libnbcompat/files/__glob13.c:1.6
--- pkgsrc/pkgtools/libnbcompat/files/__glob13.c:1.5 Wed Feb 20 14:44:24 2019
+++ pkgsrc/pkgtools/libnbcompat/files/__glob13.c Wed Oct 29 15:39:25 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: __glob13.c,v 1.5 2019/02/20 14:44:24 christos Exp $ */
+/* $NetBSD: __glob13.c,v 1.6 2025/10/29 15:39:25 nia Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93";
#else
-__RCSID("$NetBSD: __glob13.c,v 1.5 2019/02/20 14:44:24 christos Exp $");
+__RCSID("$NetBSD: __glob13.c,v 1.6 2025/10/29 15:39:25 nia Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -47,10 +47,8 @@ __RCSID("$NetBSD: __glob13.c,v 1.5 2019/
* in limits.h. But it is not usable under ordinal condition.
*/
#if !defined(MAXPATHLEN)
-#if defined(_SCO_DS)
#define MAXPATHLEN 1024
#endif
-#endif
/*
* glob(3) -- a superset of the one defined in POSIX 1003.2.
Index: pkgsrc/pkgtools/libnbcompat/files/getaddrinfo.c
diff -u pkgsrc/pkgtools/libnbcompat/files/getaddrinfo.c:1.1 pkgsrc/pkgtools/libnbcompat/files/getaddrinfo.c:1.2
--- pkgsrc/pkgtools/libnbcompat/files/getaddrinfo.c:1.1 Mon Oct 6 12:36:20 2008
+++ pkgsrc/pkgtools/libnbcompat/files/getaddrinfo.c Wed Oct 29 15:39:25 2025
@@ -121,7 +121,7 @@ freeaddrinfo(struct addrinfo *ai)
}
static struct
-addrinfo *malloc_ai(int port, u_long addr, const struct addrinfo *hints)
+addrinfo *malloc_ai(int port, unsigned long addr, const struct addrinfo *hints)
{
struct addrinfo *ai;
@@ -160,7 +160,7 @@ getaddrinfo(const char *hostname, const
struct in_addr in;
int i;
long int port;
- u_long addr;
+ unsigned long addr;
port = 0;
if (hints && hints->ai_family != AF_UNSPEC &&
Index: pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_close.c
diff -u pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_close.c:1.1 pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_close.c:1.2
--- pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_close.c:1.1 Fri Oct 10 00:21:43 2008
+++ pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_close.c Wed Oct 29 15:39:25 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: bt_close.c,v 1.1 2008/10/10 00:21:43 joerg Exp $ */
+/* $NetBSD: bt_close.c,v 1.2 2025/10/29 15:39:25 nia Exp $ */
/* NetBSD: bt_close.c,v 1.14 2008/09/11 12:58:00 joerg Exp */
/*-
@@ -36,7 +36,7 @@
#include <nbcompat.h>
#include <nbcompat/cdefs.h>
-__RCSID("$NetBSD: bt_close.c,v 1.1 2008/10/10 00:21:43 joerg Exp $");
+__RCSID("$NetBSD: bt_close.c,v 1.2 2025/10/29 15:39:25 nia Exp $");
#include <assert.h>
#include <errno.h>
@@ -114,7 +114,7 @@ __bt_close(DB *dbp)
* RET_SUCCESS, RET_ERROR.
*/
int
-__bt_sync(const DB *dbp, u_int flags)
+__bt_sync(const DB *dbp, unsigned int flags)
{
BTREE *t;
int status;
Index: pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_delete.c
diff -u pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_delete.c:1.1 pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_delete.c:1.2
--- pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_delete.c:1.1 Fri Oct 10 00:21:43 2008
+++ pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_delete.c Wed Oct 29 15:39:25 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: bt_delete.c,v 1.1 2008/10/10 00:21:43 joerg Exp $ */
+/* $NetBSD: bt_delete.c,v 1.2 2025/10/29 15:39:25 nia Exp $ */
/* NetBSD: bt_delete.c,v 1.16 2008/09/11 12:58:00 joerg Exp */
/*-
@@ -36,7 +36,7 @@
#include <nbcompat.h>
#include <nbcompat/cdefs.h>
-__RCSID("$NetBSD: bt_delete.c,v 1.1 2008/10/10 00:21:43 joerg Exp $");
+__RCSID("$NetBSD: bt_delete.c,v 1.2 2025/10/29 15:39:25 nia Exp $");
#include <sys/types.h>
@@ -49,7 +49,7 @@ __RCSID("$NetBSD: bt_delete.c,v 1.1 2008
#include "btree.h"
static int __bt_bdelete(BTREE *, const DBT *);
-static int __bt_curdel(BTREE *, const DBT *, PAGE *, u_int);
+static int __bt_curdel(BTREE *, const DBT *, PAGE *, unsigned int);
static int __bt_pdelete(BTREE *, PAGE *);
static int __bt_relink(BTREE *, PAGE *);
static int __bt_stkacq(BTREE *, PAGE **, CURSOR *);
@@ -61,7 +61,7 @@ static int __bt_stkacq(BTREE *, PAGE **,
* Return RET_SPECIAL if the key is not found.
*/
int
-__bt_delete(const DB *dbp, const DBT *key, u_int flags)
+__bt_delete(const DB *dbp, const DBT *key, unsigned int flags)
{
BTREE *t;
CURSOR *c;
@@ -106,14 +106,14 @@ __bt_delete(const DB *dbp, const DBT *ke
if (__bt_stkacq(t, &h, &t->bt_cursor))
return (RET_ERROR);
- status = __bt_dleaf(t, NULL, h, (u_int)c->pg.index);
+ status = __bt_dleaf(t, NULL, h, (unsigned int)c->pg.index);
if (NEXTINDEX(h) == 0 && status == RET_SUCCESS) {
if (__bt_pdelete(t, h))
return (RET_ERROR);
} else
mpool_put(t->bt_mp, h,
- (u_int)(status == RET_SUCCESS ?
+ (unsigned int)(status == RET_SUCCESS ?
MPOOL_DIRTY : 0));
break;
}
@@ -308,7 +308,7 @@ loop: if ((e = __bt_search(t, key, &exac
redo = 0;
h = e->page;
do {
- if (__bt_dleaf(t, key, h, (u_int)e->index)) {
+ if (__bt_dleaf(t, key, h, (unsigned int)e->index)) {
mpool_put(t->bt_mp, h, 0);
return (RET_ERROR);
}
@@ -331,7 +331,7 @@ loop: if ((e = __bt_search(t, key, &exac
while (e->index-- > 0) {
if (__bt_cmp(t, key, e) != 0)
break;
- if (__bt_dleaf(t, key, h, (u_int)e->index) == RET_ERROR) {
+ if (__bt_dleaf(t, key, h, (unsigned int)e->index) == RET_ERROR) {
mpool_put(t->bt_mp, h, 0);
return (RET_ERROR);
}
@@ -464,7 +464,7 @@ __bt_pdelete(BTREE *t, PAGE *h)
* RET_SUCCESS, RET_ERROR.
*/
int
-__bt_dleaf(BTREE *t, const DBT *key, PAGE *h, u_int idx)
+__bt_dleaf(BTREE *t, const DBT *key, PAGE *h, unsigned int idx)
{
BLEAF *bl;
indx_t cnt, *ip, offset;
@@ -525,7 +525,7 @@ __bt_dleaf(BTREE *t, const DBT *key, PAG
* RET_SUCCESS, RET_ERROR.
*/
static int
-__bt_curdel(BTREE *t, const DBT *key, PAGE *h, u_int idx)
+__bt_curdel(BTREE *t, const DBT *key, PAGE *h, unsigned int idx)
{
CURSOR *c;
EPG e;
Index: pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_get.c
diff -u pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_get.c:1.1 pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_get.c:1.2
--- pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_get.c:1.1 Fri Oct 10 00:21:43 2008
+++ pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_get.c Wed Oct 29 15:39:25 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: bt_get.c,v 1.1 2008/10/10 00:21:43 joerg Exp $ */
+/* $NetBSD: bt_get.c,v 1.2 2025/10/29 15:39:25 nia Exp $ */
/* NetBSD: bt_get.c,v 1.13 2008/09/11 12:58:00 joerg Exp */
/*-
@@ -36,7 +36,7 @@
#include <nbcompat.h>
#include <nbcompat/cdefs.h>
-__RCSID("$NetBSD: bt_get.c,v 1.1 2008/10/10 00:21:43 joerg Exp $");
+__RCSID("$NetBSD: bt_get.c,v 1.2 2025/10/29 15:39:25 nia Exp $");
#include <sys/types.h>
@@ -61,7 +61,7 @@ __RCSID("$NetBSD: bt_get.c,v 1.1 2008/10
* RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
*/
int
-__bt_get(const DB *dbp, const DBT *key, DBT *data, u_int flags)
+__bt_get(const DB *dbp, const DBT *key, DBT *data, unsigned int flags)
{
BTREE *t;
EPG *e;
Index: pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_overflow.c
diff -u pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_overflow.c:1.1 pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_overflow.c:1.2
--- pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_overflow.c:1.1 Fri Oct 10 00:21:43 2008
+++ pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_overflow.c Wed Oct 29 15:39:25 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: bt_overflow.c,v 1.1 2008/10/10 00:21:43 joerg Exp $ */
+/* $NetBSD: bt_overflow.c,v 1.2 2025/10/29 15:39:25 nia Exp $ */
/* NetBSD: bt_overflow.c,v 1.16 2008/09/11 12:58:00 joerg Exp */
/*-
@@ -36,9 +36,7 @@
#include <nbcompat.h>
#include <nbcompat/cdefs.h>
-__RCSID("$NetBSD: bt_overflow.c,v 1.1 2008/10/10 00:21:43 joerg Exp $");
-
-#include <sys/param.h>
+__RCSID("$NetBSD: bt_overflow.c,v 1.2 2025/10/29 15:39:25 nia Exp $");
#include <assert.h>
#include <stdio.h>
Index: pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_put.c
diff -u pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_put.c:1.1 pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_put.c:1.2
--- pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_put.c:1.1 Fri Oct 10 00:21:43 2008
+++ pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_put.c Wed Oct 29 15:39:25 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: bt_put.c,v 1.1 2008/10/10 00:21:43 joerg Exp $ */
+/* $NetBSD: bt_put.c,v 1.2 2025/10/29 15:39:25 nia Exp $ */
/* NetBSD: bt_put.c,v 1.18 2008/09/11 12:58:00 joerg Exp */
/*-
@@ -36,7 +36,7 @@
#include <nbcompat.h>
#include <nbcompat/cdefs.h>
-__RCSID("$NetBSD: bt_put.c,v 1.1 2008/10/10 00:21:43 joerg Exp $");
+__RCSID("$NetBSD: bt_put.c,v 1.2 2025/10/29 15:39:25 nia Exp $");
#include <sys/types.h>
@@ -65,7 +65,7 @@ static EPG *bt_fast(BTREE *, const DBT *
* tree and R_NOOVERWRITE specified.
*/
int
-__bt_put(const DB *dbp, DBT *key, const DBT *data, u_int flags)
+__bt_put(const DB *dbp, DBT *key, const DBT *data, unsigned int flags)
{
BTREE *t;
DBT tkey, tdata;
@@ -186,7 +186,7 @@ storekey: if (__ovfl_put(t, key, &pg) =
* Note, the delete may empty the page, so we need to put a
* new entry into the page immediately.
*/
-delete: if (__bt_dleaf(t, key, h, (u_int)idx) == RET_ERROR) {
+delete: if (__bt_dleaf(t, key, h, (unsigned int)idx) == RET_ERROR) {
mpool_put(t->bt_mp, h, 0);
return (RET_ERROR);
}
@@ -202,7 +202,7 @@ delete: if (__bt_dleaf(t, key, h, (u_in
nbytes = NBLEAFDBT(key->size, data->size);
if (h->upper - h->lower < nbytes + sizeof(indx_t)) {
if ((status = __bt_split(t, h, key,
- data, dflags, nbytes, (u_int)idx)) != RET_SUCCESS)
+ data, dflags, nbytes, (unsigned int)idx)) != RET_SUCCESS)
return (status);
goto success;
}
@@ -242,7 +242,7 @@ delete: if (__bt_dleaf(t, key, h, (u_in
success:
if (flags == R_SETCURSOR)
- __bt_setcur(t, e->page->pgno, (u_int)e->index);
+ __bt_setcur(t, e->page->pgno, (unsigned int)e->index);
F_SET(t, B_MODIFIED);
return (RET_SUCCESS);
Index: pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_seq.c
diff -u pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_seq.c:1.2 pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_seq.c:1.3
--- pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_seq.c:1.2 Sun Sep 8 12:02:03 2013
+++ pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_seq.c Wed Oct 29 15:39:25 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: bt_seq.c,v 1.2 2013/09/08 12:02:03 ryoon Exp $ */
+/* $NetBSD: bt_seq.c,v 1.3 2025/10/29 15:39:25 nia Exp $ */
/* NetBSD: bt_seq.c,v 1.17 2008/09/11 12:58:00 joerg Exp */
/*-
@@ -36,7 +36,7 @@
#include <nbcompat.h>
#include <nbcompat/cdefs.h>
-__RCSID("$NetBSD: bt_seq.c,v 1.2 2013/09/08 12:02:03 ryoon Exp $");
+__RCSID("$NetBSD: bt_seq.c,v 1.3 2025/10/29 15:39:25 nia Exp $");
#include <sys/types.h>
@@ -75,7 +75,7 @@ static int __bt_seqset(BTREE *, EPG *, D
* RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key.
*/
int
-__bt_seq(const DB *dbp, DBT *key, DBT *data, u_int flags)
+__bt_seq(const DB *dbp, DBT *key, DBT *data, unsigned int flags)
{
BTREE *t;
EPG e;
@@ -113,7 +113,7 @@ __bt_seq(const DB *dbp, DBT *key, DBT *d
}
if (status == RET_SUCCESS) {
- __bt_setcur(t, e.page->pgno, (u_int)e.index);
+ __bt_setcur(t, e.page->pgno, (unsigned int)e.index);
status =
__bt_ret(t, &e, key, &t->bt_rkey, data, &t->bt_rdata, 0);
@@ -423,7 +423,7 @@ __bt_first(BTREE *t, const DBT *key, EPG
* idx: page index
*/
void
-__bt_setcur(BTREE *t, pgno_t pgno, u_int idx)
+__bt_setcur(BTREE *t, pgno_t pgno, unsigned int idx)
{
/* Lose any already deleted key. */
if (t->bt_cursor.key.data != NULL) {
Index: pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_utils.c
diff -u pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_utils.c:1.2 pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_utils.c:1.3
--- pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_utils.c:1.2 Sun Sep 8 12:02:03 2013
+++ pkgsrc/pkgtools/libnbcompat/files/db/btree/bt_utils.c Wed Oct 29 15:39:25 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: bt_utils.c,v 1.2 2013/09/08 12:02:03 ryoon Exp $ */
+/* $NetBSD: bt_utils.c,v 1.3 2025/10/29 15:39:25 nia Exp $ */
/* NetBSD: bt_utils.c,v 1.13 2008/09/10 17:52:35 joerg Exp */
/*-
@@ -35,10 +35,9 @@
#include <nbcompat.h>
#include <nbcompat/cdefs.h>
+#include <nbcompat/param.h>
-__RCSID("$NetBSD: bt_utils.c,v 1.2 2013/09/08 12:02:03 ryoon Exp $");
-
-#include <sys/param.h>
+__RCSID("$NetBSD: bt_utils.c,v 1.3 2025/10/29 15:39:25 nia Exp $");
#include <assert.h>
#include <stdio.h>
Index: pkgsrc/pkgtools/libnbcompat/files/db/btree/btree.h
diff -u pkgsrc/pkgtools/libnbcompat/files/db/btree/btree.h:1.4 pkgsrc/pkgtools/libnbcompat/files/db/btree/btree.h:1.5
--- pkgsrc/pkgtools/libnbcompat/files/db/btree/btree.h:1.4 Sun Sep 8 12:02:03 2013
+++ pkgsrc/pkgtools/libnbcompat/files/db/btree/btree.h Wed Oct 29 15:39:25 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: btree.h,v 1.4 2013/09/08 12:02:03 ryoon Exp $ */
+/* $NetBSD: btree.h,v 1.5 2025/10/29 15:39:25 nia Exp $ */
/* NetBSD: btree.h,v 1.16 2008/08/26 21:18:38 joerg Exp */
/*-
@@ -395,9 +395,9 @@ typedef struct _btree {
FILE *bt_rfp; /* R: record FILE pointer */
int bt_rfd; /* R: record file descriptor */
- caddr_t bt_cmap; /* R: current point in mapped space */
- caddr_t bt_smap; /* R: start of mapped space */
- caddr_t bt_emap; /* R: end of mapped space */
+ void * bt_cmap; /* R: current point in mapped space */
+ void * bt_smap; /* R: start of mapped space */
+ void * bt_emap; /* R: end of mapped space */
size_t bt_msize; /* R: size of mapped region. */
recno_t bt_nrecs; /* R: number of records */
Index: pkgsrc/pkgtools/libnbcompat/files/db/db/db.c
diff -u pkgsrc/pkgtools/libnbcompat/files/db/db/db.c:1.3 pkgsrc/pkgtools/libnbcompat/files/db/db/db.c:1.4
--- pkgsrc/pkgtools/libnbcompat/files/db/db/db.c:1.3 Sun Jan 24 12:29:48 2010
+++ pkgsrc/pkgtools/libnbcompat/files/db/db/db.c Wed Oct 29 15:39:26 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: db.c,v 1.3 2010/01/24 12:29:48 obache Exp $ */
+/* $NetBSD: db.c,v 1.4 2025/10/29 15:39:26 nia Exp $ */
/* NetBSD: db.c,v 1.16 2008/09/11 12:58:00 joerg Exp */
/*-
@@ -33,7 +33,7 @@
#include <nbcompat.h>
#include <nbcompat/cdefs.h>
-__RCSID("$NetBSD: db.c,v 1.3 2010/01/24 12:29:48 obache Exp $");
+__RCSID("$NetBSD: db.c,v 1.4 2025/10/29 15:39:26 nia Exp $");
#include <sys/types.h>
@@ -100,10 +100,10 @@ void
__dbpanic(DB *dbp)
{
/* The only thing that can succeed is a close. */
- dbp->del = (int (*)(const struct __db *, const DBT*, u_int))__dberr;
+ dbp->del = (int (*)(const struct __db *, const DBT*, unsigned int))__dberr;
dbp->fd = (int (*)(const struct __db *))__dberr;
- dbp->get = (int (*)(const struct __db *, const DBT*, DBT *, u_int))__dberr;
- dbp->put = (int (*)(const struct __db *, DBT *, const DBT *, u_int))__dberr;
- dbp->seq = (int (*)(const struct __db *, DBT *, DBT *, u_int))__dberr;
- dbp->sync = (int (*)(const struct __db *, u_int))__dberr;
+ dbp->get = (int (*)(const struct __db *, const DBT*, DBT *, unsigned int))__dberr;
+ dbp->put = (int (*)(const struct __db *, DBT *, const DBT *, unsigned int))__dberr;
+ dbp->seq = (int (*)(const struct __db *, DBT *, DBT *, unsigned int))__dberr;
+ dbp->sync = (int (*)(const struct __db *, unsigned int))__dberr;
}
Index: pkgsrc/pkgtools/libnbcompat/files/db/hash/extern.h
diff -u pkgsrc/pkgtools/libnbcompat/files/db/hash/extern.h:1.1 pkgsrc/pkgtools/libnbcompat/files/db/hash/extern.h:1.2
--- pkgsrc/pkgtools/libnbcompat/files/db/hash/extern.h:1.1 Fri Oct 10 00:21:43 2008
+++ pkgsrc/pkgtools/libnbcompat/files/db/hash/extern.h Wed Oct 29 15:39:26 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.1 2008/10/10 00:21:43 joerg Exp $ */
+/* $NetBSD: extern.h,v 1.2 2025/10/29 15:39:26 nia Exp $ */
/* NetBSD: extern.h,v 1.9 2008/08/26 21:18:38 joerg Exp */
/*-
@@ -41,7 +41,7 @@ int __big_return(HTAB *, BUFHEAD *, int
int __big_split(HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *,
int, uint32_t, SPLIT_RETURN *);
int __buf_free(HTAB *, int, int);
-void __buf_init(HTAB *, u_int);
+void __buf_init(HTAB *, unsigned int);
uint32_t __call_hash(HTAB *, char *, int);
int __delpair(HTAB *, BUFHEAD *, int);
int __expand_table(HTAB *);
Index: pkgsrc/pkgtools/libnbcompat/files/db/hash/hash_bigkey.c
diff -u pkgsrc/pkgtools/libnbcompat/files/db/hash/hash_bigkey.c:1.1 pkgsrc/pkgtools/libnbcompat/files/db/hash/hash_bigkey.c:1.2
--- pkgsrc/pkgtools/libnbcompat/files/db/hash/hash_bigkey.c:1.1 Fri Oct 10 00:21:43 2008
+++ pkgsrc/pkgtools/libnbcompat/files/db/hash/hash_bigkey.c Wed Oct 29 15:39:26 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: hash_bigkey.c,v 1.1 2008/10/10 00:21:43 joerg Exp $ */
+/* $NetBSD: hash_bigkey.c,v 1.2 2025/10/29 15:39:26 nia Exp $ */
/* NetBSD: hash_bigkey.c,v 1.22 2008/09/10 17:52:35 joerg Exp */
/*-
@@ -35,8 +35,9 @@
#include <nbcompat.h>
#include <nbcompat/cdefs.h>
+#include <nbcompat/param.h>
-__RCSID("$NetBSD: hash_bigkey.c,v 1.1 2008/10/10 00:21:43 joerg Exp $");
+__RCSID("$NetBSD: hash_bigkey.c,v 1.2 2025/10/29 15:39:26 nia Exp $");
/*
* PACKAGE: hash
@@ -56,8 +57,6 @@ __RCSID("$NetBSD: hash_bigkey.c,v 1.1 20
* collect_data
*/
-#include <sys/param.h>
-
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
Index: pkgsrc/pkgtools/libnbcompat/files/db/hash/hash_buf.c
diff -u pkgsrc/pkgtools/libnbcompat/files/db/hash/hash_buf.c:1.1 pkgsrc/pkgtools/libnbcompat/files/db/hash/hash_buf.c:1.2
--- pkgsrc/pkgtools/libnbcompat/files/db/hash/hash_buf.c:1.1 Fri Oct 10 00:21:43 2008
+++ pkgsrc/pkgtools/libnbcompat/files/db/hash/hash_buf.c Wed Oct 29 15:39:26 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: hash_buf.c,v 1.1 2008/10/10 00:21:43 joerg Exp $ */
+/* $NetBSD: hash_buf.c,v 1.2 2025/10/29 15:39:26 nia Exp $ */
/* NetBSD: hash_buf.c,v 1.14 2008/09/10 17:52:35 joerg Exp */
/*-
@@ -35,8 +35,9 @@
#include <nbcompat.h>
#include <nbcompat/cdefs.h>
+#include <nbcompat/param.h>
-__RCSID("$NetBSD: hash_buf.c,v 1.1 2008/10/10 00:21:43 joerg Exp $");
+__RCSID("$NetBSD: hash_buf.c,v 1.2 2025/10/29 15:39:26 nia Exp $");
/*
* PACKAGE: hash
@@ -54,8 +55,6 @@ __RCSID("$NetBSD: hash_buf.c,v 1.1 2008/
* newbuf
*/
-#include <sys/param.h>
-
#include <errno.h>
#include <stddef.h>
#include <stdio.h>
@@ -138,7 +137,7 @@ __get_buf(
return (NULL);
if (!prev_bp)
segp[segment_ndx] =
- (BUFHEAD *)(void *)((u_long)bp | is_disk_mask);
+ (BUFHEAD *)(void *)((unsigned long)bp | is_disk_mask);
} else {
BUF_REMOVE(bp);
MRU_INSERT(bp);
@@ -272,7 +271,7 @@ newbuf(HTAB *hashp, uint32_t addr, BUFHE
}
void
-__buf_init(HTAB *hashp, u_int nbytes)
+__buf_init(HTAB *hashp, unsigned int nbytes)
{
BUFHEAD *bfp;
int npages;
Index: pkgsrc/pkgtools/libnbcompat/files/db/hash/hash.c
diff -u pkgsrc/pkgtools/libnbcompat/files/db/hash/hash.c:1.4 pkgsrc/pkgtools/libnbcompat/files/db/hash/hash.c:1.5
--- pkgsrc/pkgtools/libnbcompat/files/db/hash/hash.c:1.4 Tue May 15 16:45:45 2012
+++ pkgsrc/pkgtools/libnbcompat/files/db/hash/hash.c Wed Oct 29 15:39:26 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: hash.c,v 1.4 2012/05/15 16:45:45 christos Exp $ */
+/* $NetBSD: hash.c,v 1.5 2025/10/29 15:39:26 nia Exp $ */
/* NetBSD: hash.c,v 1.30 2008/09/11 12:58:00 joerg Exp */
/*-
@@ -36,7 +36,7 @@
#include <nbcompat.h>
#include <nbcompat/cdefs.h>
-__RCSID("$NetBSD: hash.c,v 1.4 2012/05/15 16:45:45 christos Exp $");
+__RCSID("$NetBSD: hash.c,v 1.5 2025/10/29 15:39:26 nia Exp $");
#include <nbcompat/param.h>
#include <sys/stat.h>
@@ -513,7 +513,7 @@ flush_meta(HTAB *hashp)
for (i = 0; i < NCACHED; i++)
if (hashp->mapp[i])
if (__put_page(hashp, (char *)(void *)hashp->mapp[i],
- (u_int)hashp->BITMAPS[i], 0, 1))
+ (unsigned int)hashp->BITMAPS[i], 0, 1))
return (-1);
return (0);
}
Index: pkgsrc/pkgtools/libnbcompat/files/db/hash/hash.h
diff -u pkgsrc/pkgtools/libnbcompat/files/db/hash/hash.h:1.3 pkgsrc/pkgtools/libnbcompat/files/db/hash/hash.h:1.4
--- pkgsrc/pkgtools/libnbcompat/files/db/hash/hash.h:1.3 Sat Feb 27 16:27:00 2010
+++ pkgsrc/pkgtools/libnbcompat/files/db/hash/hash.h Wed Oct 29 15:39:26 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: hash.h,v 1.3 2010/02/27 16:27:00 joerg Exp $ */
+/* $NetBSD: hash.h,v 1.4 2025/10/29 15:39:26 nia Exp $ */
/* NetBSD: hash.h,v 1.15 2008/08/26 21:18:38 joerg Exp */
/*-
@@ -143,11 +143,11 @@ typedef struct htab { /* Memory reside
#define ALL_SET ((uint32_t)0xFFFFFFFF)
#define ALL_CLEAR 0
-#define PTROF(X) ((BUFHEAD *)(void *)((u_long)(X)&~0x3))
-#define ISMOD(X) ((uint32_t)(u_long)(X)&0x1)
-#define DOMOD(X) ((X) = (char *)(void *)((u_long)(X)|0x1))
-#define ISDISK(X) ((uint32_t)(u_long)(X)&0x2)
-#define DODISK(X) ((X) = (char *)(void *)((u_long)(X)|0x2))
+#define PTROF(X) ((BUFHEAD *)(void *)((unsigned long)(X)&~0x3))
+#define ISMOD(X) ((uint32_t)(unsigned long)(X)&0x1)
+#define DOMOD(X) ((X) = (char *)(void *)((unsigned long)(X)|0x1))
+#define ISDISK(X) ((uint32_t)(unsigned long)(X)&0x2)
+#define DODISK(X) ((X) = (char *)(void *)((unsigned long)(X)|0x2))
#define BITS_PER_MAP 32
Index: pkgsrc/pkgtools/libnbcompat/files/db/hash/ndbmdatum.c
diff -u pkgsrc/pkgtools/libnbcompat/files/db/hash/ndbmdatum.c:1.2 pkgsrc/pkgtools/libnbcompat/files/db/hash/ndbmdatum.c:1.3
--- pkgsrc/pkgtools/libnbcompat/files/db/hash/ndbmdatum.c:1.2 Wed Oct 29 11:23:17 2008
+++ pkgsrc/pkgtools/libnbcompat/files/db/hash/ndbmdatum.c Wed Oct 29 15:39:26 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: ndbmdatum.c,v 1.2 2008/10/29 11:23:17 joerg Exp $ */
+/* $NetBSD: ndbmdatum.c,v 1.3 2025/10/29 15:39:26 nia Exp $ */
/* NetBSD: ndbmdatum.c,v 1.4 2008/09/11 12:58:00 joerg Exp */
/*-
@@ -36,7 +36,7 @@
#include <nbcompat.h>
#include <nbcompat/cdefs.h>
-__RCSID("$NetBSD: ndbmdatum.c,v 1.2 2008/10/29 11:23:17 joerg Exp $");
+__RCSID("$NetBSD: ndbmdatum.c,v 1.3 2025/10/29 15:39:26 nia Exp $");
/*
* This package provides a dbm compatible interface to the new hashing
@@ -151,5 +151,5 @@ dbm_store(DBM *db, datum key, datum data
dbtdata.data = data.dptr;
dbtdata.size = data.dsize;
return ((db->put)(db, &dbtkey, &dbtdata,
- (u_int)((flags == DBM_INSERT) ? R_NOOVERWRITE : 0)));
+ (unsigned int)((flags == DBM_INSERT) ? R_NOOVERWRITE : 0)));
}
Index: pkgsrc/pkgtools/libnbcompat/files/db/mpool/mpool.c
diff -u pkgsrc/pkgtools/libnbcompat/files/db/mpool/mpool.c:1.6 pkgsrc/pkgtools/libnbcompat/files/db/mpool/mpool.c:1.7
--- pkgsrc/pkgtools/libnbcompat/files/db/mpool/mpool.c:1.6 Sun Sep 8 16:24:43 2013
+++ pkgsrc/pkgtools/libnbcompat/files/db/mpool/mpool.c Wed Oct 29 15:39:26 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: mpool.c,v 1.6 2013/09/08 16:24:43 ryoon Exp $ */
+/* $NetBSD: mpool.c,v 1.7 2025/10/29 15:39:26 nia Exp $ */
/* NetBSD: mpool.c,v 1.18 2008/09/11 12:58:00 joerg Exp */
/*-
@@ -33,7 +33,7 @@
#include <nbcompat.h>
#include <nbcompat/cdefs.h>
-__RCSID("$NetBSD: mpool.c,v 1.6 2013/09/08 16:24:43 ryoon Exp $");
+__RCSID("$NetBSD: mpool.c,v 1.7 2025/10/29 15:39:26 nia Exp $");
#include <nbcompat/queue.h>
#include <sys/stat.h>
@@ -170,7 +170,7 @@ mpool_new( MPOOL *mp, pgno_t *pgnoaddr)
*/
/*ARGSUSED*/
void *
-mpool_get(MPOOL *mp, pgno_t pgno, u_int flags)
+mpool_get(MPOOL *mp, pgno_t pgno, unsigned int flags)
{
struct _hqh *head;
BKT *bp;
@@ -251,7 +251,7 @@ mpool_get(MPOOL *mp, pgno_t pgno, u_int
*/
/*ARGSUSED*/
int
-mpool_put(MPOOL *mp, void *page, u_int flags)
+mpool_put(MPOOL *mp, void *page, unsigned int flags)
{
BKT *bp;
@@ -440,10 +440,10 @@ mpool_stat(mp)
int cnt;
const char *sep;
- (void)fprintf(stderr, "%lu pages in the file\n", (u_long)mp->npages);
+ (void)fprintf(stderr, "%lu pages in the file\n", (unsigned long)mp->npages);
(void)fprintf(stderr,
"page size %lu, cacheing %lu pages of %lu page max cache\n",
- (u_long)mp->pagesize, (u_long)mp->curcache, (u_long)mp->maxcache);
+ (unsigned long)mp->pagesize, (unsigned long)mp->curcache, (unsigned long)mp->maxcache);
(void)fprintf(stderr, "%lu page puts, %lu page gets, %lu page new\n",
mp->pageput, mp->pageget, mp->pagenew);
(void)fprintf(stderr, "%lu page allocs, %lu page flushes\n",
Index: pkgsrc/pkgtools/libnbcompat/files/db/recno/extern.h
diff -u pkgsrc/pkgtools/libnbcompat/files/db/recno/extern.h:1.1 pkgsrc/pkgtools/libnbcompat/files/db/recno/extern.h:1.2
--- pkgsrc/pkgtools/libnbcompat/files/db/recno/extern.h:1.1 Fri Oct 10 00:21:44 2008
+++ pkgsrc/pkgtools/libnbcompat/files/db/recno/extern.h Wed Oct 29 15:39:26 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.1 2008/10/10 00:21:44 joerg Exp $ */
+/* $NetBSD: extern.h,v 1.2 2025/10/29 15:39:26 nia Exp $ */
/* NetBSD: extern.h,v 1.8 2008/08/26 21:18:38 joerg Exp */
/*-
@@ -35,19 +35,19 @@
#include "../btree/extern.h"
int __rec_close(DB *);
-int __rec_delete(const DB *, const DBT *, u_int);
+int __rec_delete(const DB *, const DBT *, unsigned int);
int __rec_dleaf(BTREE *, PAGE *, uint32_t);
int __rec_fd(const DB *);
int __rec_fmap(BTREE *, recno_t);
int __rec_fout(BTREE *);
int __rec_fpipe(BTREE *, recno_t);
-int __rec_get(const DB *, const DBT *, DBT *, u_int);
-int __rec_iput(BTREE *, recno_t, const DBT *, u_int);
-int __rec_put(const DB *dbp, DBT *, const DBT *, u_int);
+int __rec_get(const DB *, const DBT *, DBT *, unsigned int);
+int __rec_iput(BTREE *, recno_t, const DBT *, unsigned int);
+int __rec_put(const DB *dbp, DBT *, const DBT *, unsigned int);
int __rec_ret(BTREE *, EPG *, recno_t, DBT *, DBT *);
EPG *__rec_search(BTREE *, recno_t, enum SRCHOP);
-int __rec_seq(const DB *, DBT *, DBT *, u_int);
-int __rec_sync(const DB *, u_int);
+int __rec_seq(const DB *, DBT *, DBT *, unsigned int);
+int __rec_sync(const DB *, unsigned int);
int __rec_vmap(BTREE *, recno_t);
int __rec_vout(BTREE *);
int __rec_vpipe(BTREE *, recno_t);
Index: pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_delete.c
diff -u pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_delete.c:1.1 pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_delete.c:1.2
--- pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_delete.c:1.1 Fri Oct 10 00:21:44 2008
+++ pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_delete.c Wed Oct 29 15:39:26 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: rec_delete.c,v 1.1 2008/10/10 00:21:44 joerg Exp $ */
+/* $NetBSD: rec_delete.c,v 1.2 2025/10/29 15:39:26 nia Exp $ */
/* NetBSD: rec_delete.c,v 1.17 2008/09/11 12:58:00 joerg Exp */
/*-
@@ -36,7 +36,7 @@
#include <nbcompat.h>
#include <nbcompat/cdefs.h>
-__RCSID("$NetBSD: rec_delete.c,v 1.1 2008/10/10 00:21:44 joerg Exp $");
+__RCSID("$NetBSD: rec_delete.c,v 1.2 2025/10/29 15:39:26 nia Exp $");
#include <sys/types.h>
@@ -62,7 +62,7 @@ static int rec_rdelete(BTREE *, recno_t)
* RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
*/
int
-__rec_delete(const DB *dbp, const DBT *key, u_int flags)
+__rec_delete(const DB *dbp, const DBT *key, unsigned int flags)
{
BTREE *t;
recno_t nrec;
Index: pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_get.c
diff -u pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_get.c:1.1 pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_get.c:1.2
--- pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_get.c:1.1 Fri Oct 10 00:21:44 2008
+++ pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_get.c Wed Oct 29 15:39:26 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: rec_get.c,v 1.1 2008/10/10 00:21:44 joerg Exp $ */
+/* $NetBSD: rec_get.c,v 1.2 2025/10/29 15:39:26 nia Exp $ */
/* NetBSD: rec_get.c,v 1.16 2008/09/11 12:58:00 joerg Exp */
/*-
@@ -33,7 +33,7 @@
#include <nbcompat.h>
#include <nbcompat/cdefs.h>
-__RCSID("$NetBSD: rec_get.c,v 1.1 2008/10/10 00:21:44 joerg Exp $");
+__RCSID("$NetBSD: rec_get.c,v 1.2 2025/10/29 15:39:26 nia Exp $");
#include <sys/types.h>
@@ -61,7 +61,7 @@ __RCSID("$NetBSD: rec_get.c,v 1.1 2008/1
* RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
*/
int
-__rec_get(const DB *dbp, const DBT *key, DBT *data, u_int flags)
+__rec_get(const DB *dbp, const DBT *key, DBT *data, unsigned int flags)
{
BTREE *t;
EPG *e;
@@ -258,7 +258,7 @@ __rec_fmap(BTREE *t, recno_t top)
if (__rec_iput(t, nrec, &data, 0) != RET_SUCCESS)
return (RET_ERROR);
}
- t->bt_cmap = (caddr_t)sp;
+ t->bt_cmap = (void *)sp;
return (RET_SUCCESS);
}
@@ -295,6 +295,6 @@ __rec_vmap(BTREE *t, recno_t top)
return (RET_ERROR);
++sp;
}
- t->bt_cmap = (caddr_t)sp;
+ t->bt_cmap = (void *)sp;
return (RET_SUCCESS);
}
Index: pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_put.c
diff -u pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_put.c:1.1 pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_put.c:1.2
--- pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_put.c:1.1 Fri Oct 10 00:21:44 2008
+++ pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_put.c Wed Oct 29 15:39:26 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: rec_put.c,v 1.1 2008/10/10 00:21:44 joerg Exp $ */
+/* $NetBSD: rec_put.c,v 1.2 2025/10/29 15:39:26 nia Exp $ */
/* NetBSD: rec_put.c,v 1.17 2008/09/11 12:58:00 joerg Exp */
/*-
@@ -33,7 +33,7 @@
#include <nbcompat.h>
#include <nbcompat/cdefs.h>
-__RCSID("$NetBSD: rec_put.c,v 1.1 2008/10/10 00:21:44 joerg Exp $");
+__RCSID("$NetBSD: rec_put.c,v 1.2 2025/10/29 15:39:26 nia Exp $");
#include <sys/types.h>
@@ -60,7 +60,7 @@ __RCSID("$NetBSD: rec_put.c,v 1.1 2008/1
* already in the tree and R_NOOVERWRITE specified.
*/
int
-__rec_put(const DB *dbp, DBT *key, const DBT *data, u_int flags)
+__rec_put(const DB *dbp, DBT *key, const DBT *data, unsigned int flags)
{
BTREE *t;
DBT fdata, tdata;
@@ -184,7 +184,7 @@ einval: errno = EINVAL;
* RET_ERROR, RET_SUCCESS
*/
int
-__rec_iput(BTREE *t, recno_t nrec, const DBT *data, u_int flags)
+__rec_iput(BTREE *t, recno_t nrec, const DBT *data, unsigned int flags)
{
DBT tdata;
EPG *e;
Index: pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_seq.c
diff -u pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_seq.c:1.1 pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_seq.c:1.2
--- pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_seq.c:1.1 Fri Oct 10 00:21:44 2008
+++ pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_seq.c Wed Oct 29 15:39:26 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: rec_seq.c,v 1.1 2008/10/10 00:21:44 joerg Exp $ */
+/* $NetBSD: rec_seq.c,v 1.2 2025/10/29 15:39:26 nia Exp $ */
/* NetBSD: rec_seq.c,v 1.14 2008/09/11 12:58:00 joerg Exp */
/*-
@@ -33,7 +33,7 @@
#include <nbcompat.h>
#include <nbcompat/cdefs.h>
-__RCSID("$NetBSD: rec_seq.c,v 1.1 2008/10/10 00:21:44 joerg Exp $");
+__RCSID("$NetBSD: rec_seq.c,v 1.2 2025/10/29 15:39:26 nia Exp $");
#include <sys/types.h>
@@ -59,7 +59,7 @@ __RCSID("$NetBSD: rec_seq.c,v 1.1 2008/1
* RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key.
*/
int
-__rec_seq(const DB *dbp, DBT *key, DBT *data, u_int flags)
+__rec_seq(const DB *dbp, DBT *key, DBT *data, unsigned int flags)
{
BTREE *t;
EPG *e;
Index: pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_utils.c
diff -u pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_utils.c:1.1 pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_utils.c:1.2
--- pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_utils.c:1.1 Fri Oct 10 00:21:44 2008
+++ pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_utils.c Wed Oct 29 15:39:26 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: rec_utils.c,v 1.1 2008/10/10 00:21:44 joerg Exp $ */
+/* $NetBSD: rec_utils.c,v 1.2 2025/10/29 15:39:26 nia Exp $ */
/* NetBSD: rec_utils.c,v 1.12 2008/09/10 17:52:36 joerg Exp */
/*-
@@ -32,10 +32,9 @@
#include <nbcompat.h>
#include <nbcompat/cdefs.h>
+#include <nbcompat/param.h>
-__RCSID("$NetBSD: rec_utils.c,v 1.1 2008/10/10 00:21:44 joerg Exp $");
-
-#include <sys/param.h>
+__RCSID("$NetBSD: rec_utils.c,v 1.2 2025/10/29 15:39:26 nia Exp $");
#include <assert.h>
#include <stdio.h>
Index: pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_close.c
diff -u pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_close.c:1.2 pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_close.c:1.3
--- pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_close.c:1.2 Sun Sep 8 16:24:43 2013
+++ pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_close.c Wed Oct 29 15:39:26 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: rec_close.c,v 1.2 2013/09/08 16:24:43 ryoon Exp $ */
+/* $NetBSD: rec_close.c,v 1.3 2025/10/29 15:39:26 nia Exp $ */
/* NetBSD: rec_close.c,v 1.15 2008/09/11 12:58:00 joerg Exp */
/*-
@@ -33,7 +33,7 @@
#include <nbcompat.h>
#include <nbcompat/cdefs.h>
-__RCSID("$NetBSD: rec_close.c,v 1.2 2013/09/08 16:24:43 ryoon Exp $");
+__RCSID("$NetBSD: rec_close.c,v 1.3 2025/10/29 15:39:26 nia Exp $");
#include <sys/types.h>
#include <sys/uio.h>
@@ -109,7 +109,7 @@ __rec_close(DB *dbp)
* RET_SUCCESS, RET_ERROR.
*/
int
-__rec_sync(const DB *dbp, u_int flags)
+__rec_sync(const DB *dbp, unsigned int flags)
{
struct iovec iov[2];
BTREE *t;
Index: pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_open.c
diff -u pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_open.c:1.3 pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_open.c:1.4
--- pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_open.c:1.3 Sun Sep 8 16:24:43 2013
+++ pkgsrc/pkgtools/libnbcompat/files/db/recno/rec_open.c Wed Oct 29 15:39:26 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: rec_open.c,v 1.3 2013/09/08 16:24:43 ryoon Exp $ */
+/* $NetBSD: rec_open.c,v 1.4 2025/10/29 15:39:26 nia Exp $ */
/* NetBSD: rec_open.c,v 1.17 2008/09/11 12:58:00 joerg Exp */
/*-
@@ -36,7 +36,7 @@
#include <nbcompat.h>
#include <nbcompat/cdefs.h>
-__RCSID("$NetBSD: rec_open.c,v 1.3 2013/09/08 16:24:43 ryoon Exp $");
+__RCSID("$NetBSD: rec_open.c,v 1.4 2025/10/29 15:39:26 nia Exp $");
#include <sys/types.h>
#if HAVE_SYS_MMAN_H
@@ -180,7 +180,7 @@ slow: if ((t->bt_rfp = fdopen(rfd, "r"
t->bt_msize = sb.st_size;
if ((t->bt_smap = mmap(NULL, t->bt_msize,
PROT_READ, MAP_FILE | MAP_PRIVATE, rfd,
- (off_t)0)) == (caddr_t)-1)
+ (off_t)0)) == (void *)-1)
goto slow;
t->bt_cmap = t->bt_smap;
t->bt_emap = t->bt_smap + sb.st_size;
Index: pkgsrc/pkgtools/libnbcompat/files/nbcompat/db.h
diff -u pkgsrc/pkgtools/libnbcompat/files/nbcompat/db.h:1.4 pkgsrc/pkgtools/libnbcompat/files/nbcompat/db.h:1.5
--- pkgsrc/pkgtools/libnbcompat/files/nbcompat/db.h:1.4 Fri Mar 14 22:08:18 2014
+++ pkgsrc/pkgtools/libnbcompat/files/nbcompat/db.h Wed Oct 29 15:39:26 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: db.h,v 1.4 2014/03/14 22:08:18 ryoon Exp $ */
+/* $NetBSD: db.h,v 1.5 2025/10/29 15:39:26 nia Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -56,10 +56,8 @@
* in limits.h. But it is not usable under ordinal condition.
*/
#if !defined(MAXPATHLEN)
-#if defined(_SCO_DS)
#define MAXPATHLEN 1024
#endif
-#endif
#define MAX_PAGE_NUMBER 0xffffffff /* >= # of pages in a file */
typedef uint32_t pgno_t;
Home |
Main Index |
Thread Index |
Old Index