Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Libraries updates and cleanup

Browse Source 
* Updating common/lib
 * Updating lib/csu
 * Updating lib/libc
 * Updating libexec/ld.elf_so
 * Corrected test on __minix in featuretest to actually follow the
   meaning of the comment.
 * Cleaned up _REENTRANT-related defintions.
 * Disabled -D_REENTRANT for libfetch
 * Removing some unneeded __NBSD_LIBC defines and tests

Change-Id: Ic1394baef74d11b9f86b312f5ff4bbc3cbf72ce2
This commit is contained in:
sambuc
2013-01-14 11:36:26 +01:00
parent f6aac1c3b5
commit f14fb60209
1285 changed files with 44244 additions and 14308 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/libc/db/btree/bt_debug.c
+25 -8
View File
@@ -1,4 +1,4 @@
/* $NetBSD: bt_debug.c,v 1.15 2008/09/10 17:52:35 joerg Exp $ */
/* $NetBSD: bt_debug.c,v 1.16 2011/07/17 20:47:39 christos Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -37,7 +37,7 @@
#endif
#include <sys/cdefs.h>
__RCSID("$NetBSD: bt_debug.c,v 1.15 2008/09/10 17:52:35 joerg Exp $");
__RCSID("$NetBSD: bt_debug.c,v 1.16 2011/07/17 20:47:39 christos Exp $");
#include <assert.h>
#include <stdio.h>
@@ -124,6 +124,22 @@ __bt_dmpage(PAGE *h)
}
}
static pgno_t
__bt_pgno_t(const void *m)
{
pgno_t r;
memcpy(&r, m, sizeof(r));
return r;
}
static uint32_t
__bt_uint32_t(const void *m)
{
uint32_t r;
memcpy(&r, m, sizeof(r));
return r;
}
/*
* BT_DNPAGE -- Dump the page
*
@@ -206,15 +222,16 @@ __bt_dpage(PAGE *h)
if (bl->flags & P_BIGKEY)
(void)fprintf(stderr,
"big key page %lu size %u/",
(unsigned long) *(pgno_t *)(void *)bl->bytes,
*(uint32_t *)(void *)(bl->bytes + sizeof(pgno_t)));
(unsigned long) __bt_pgno_t(bl->bytes),
__bt_uint32_t(bl->bytes + sizeof(pgno_t)));
else if (bl->ksize)
(void)fprintf(stderr, "%s/", bl->bytes);
if (bl->flags & P_BIGDATA)
(void)fprintf(stderr,
"big data page %lu size %u",
(unsigned long) *(pgno_t *)(void *)(bl->bytes + bl->ksize),
*(uint32_t *)(void *)(bl->bytes + bl->ksize +
(unsigned long)
__bt_pgno_t(bl->bytes + bl->ksize),
__bt_uint32_t(bl->bytes + bl->ksize +
sizeof(pgno_t)));
else if (bl->dsize)
(void)fprintf(stderr, "%.*s",
@@ -225,8 +242,8 @@ __bt_dpage(PAGE *h)
if (rl->flags & P_BIGDATA)
(void)fprintf(stderr,
"big data page %lu size %u",
(unsigned long) *(pgno_t *)(void *)rl->bytes,
*(uint32_t *)(void *)(rl->bytes + sizeof(pgno_t)));
(unsigned long) __bt_pgno_t(rl->bytes),
__bt_uint32_t(rl->bytes + sizeof(pgno_t)));
else if (rl->dsize)
(void)fprintf(stderr,
"%.*s", (int)rl->dsize, rl->bytes);