diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2011-12-01 23:55:58 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-12-01 23:55:58 +0000 |
| commit | ba6b743ba088a1ee889f6315c05711d3e4505d61 (patch) | |
| tree | 0a1b5c0d971b40567c23c9ae439439bf869f9a10 | |
| parent | 80244c48e0ba678ad998cda0739a4d5dc399ac10 (diff) | |
| download | mandoc-ba6b743ba088a1ee889f6315c05711d3e4505d61.tar.gz mandoc-ba6b743ba088a1ee889f6315c05711d3e4505d61.tar.zst mandoc-ba6b743ba088a1ee889f6315c05711d3e4505d61.zip | |
Use OpenBSD's endian functions. Make btree type also be endian-neutral.
| -rw-r--r-- | apropos_db.c | 8 | ||||
| -rw-r--r-- | mandocdb.c | 10 |
2 files changed, 7 insertions, 11 deletions
diff --git a/apropos_db.c b/apropos_db.c index 4d9ae874..4a305e59 100644 --- a/apropos_db.c +++ b/apropos_db.c @@ -1,4 +1,4 @@ -/* $Id: apropos_db.c,v 1.17 2011/12/01 23:46:26 kristaps Exp $ */ +/* $Id: apropos_db.c,v 1.18 2011/12/01 23:55:58 kristaps Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org> @@ -24,8 +24,6 @@ #include <string.h> #include <unistd.h> -#include <arpa/inet.h> - #ifdef __linux__ # include <db_185.h> #else @@ -177,8 +175,8 @@ btree_read(const DBT *k, const DBT *v, vp = v->data; norm_string((const char *)k->data, mc, buf); - dbv->rec = ntohl(vp->rec); - dbv->mask = vp->mask; + dbv->rec = betoh32(vp->rec); + dbv->mask = betoh64(vp->mask); return(1); } @@ -1,4 +1,4 @@ -/* $Id: mandocdb.c,v 1.19 2011/12/01 23:46:26 kristaps Exp $ */ +/* $Id: mandocdb.c,v 1.20 2011/12/01 23:55:58 kristaps Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org> @@ -33,8 +33,6 @@ #include <string.h> #include <unistd.h> -#include <arpa/inet.h> - #ifdef __linux__ # include <db_185.h> #else @@ -628,11 +626,11 @@ index_merge(const struct of *of, struct mparse *mp, * into the database. */ - vbuf.rec = htonl(rec); + vbuf.rec = htobe32(rec); seq = R_FIRST; while (0 == (ch = (*hash->seq)(hash, &key, &val, seq))) { seq = R_NEXT; - vbuf.mask = *(uint64_t *)val.data; + vbuf.mask = htobe64(*(uint64_t *)val.data); val.size = sizeof(struct db_val); val.data = &vbuf; dbt_put(db, dbf, &key, &val); @@ -732,7 +730,7 @@ index_prune(const struct of *ofile, DB *db, const char *dbf, break; vbuf = val.data; - if (*maxrec != ntohl(vbuf->rec)) + if (*maxrec != betoh32(vbuf->rec)) continue; if ((ch = (*db->del)(db, &key, R_CURSOR)) < 0) |