diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2011-12-25 14:58:39 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2011-12-25 14:58:39 +0000 |
| commit | 0c0e6315b693c775634281199f1983184acff5e5 (patch) | |
| tree | d84de2f1f28d10439bc42fea70a642be4b63afe0 /mandocdb.c | |
| parent | 1282796854ba0d64d77baf61f72081d5c1e45a8c (diff) | |
| download | mandoc-0c0e6315b693c775634281199f1983184acff5e5.tar.gz mandoc-0c0e6315b693c775634281199f1983184acff5e5.tar.zst mandoc-0c0e6315b693c775634281199f1983184acff5e5.zip | |
For binary compatability of the databases across architectures,
use pointers to arrays, not pointers to structs. It is now possible
to create databases on sparc64 and use them on i386 and vice versa.
Kristaps@ can't think of anything else that might be required, either.
Put this in now such that we can move on.
Diffstat (limited to 'mandocdb.c')
| -rw-r--r-- | mandocdb.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -1,4 +1,4 @@ -/* $Id: mandocdb.c,v 1.38 2011/12/25 13:08:12 schwarze Exp $ */ +/* $Id: mandocdb.c,v 1.39 2011/12/25 14:58:39 schwarze Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org> @@ -575,7 +575,7 @@ index_merge(const struct of *of, struct mparse *mp, uint64_t mask; size_t sv; unsigned seq; - struct db_val vbuf; + uint64_t vbuf[2]; char type; rec = 0; @@ -714,7 +714,7 @@ index_merge(const struct of *of, struct mparse *mp, recs->last = 0; } else rec++; - vbuf.rec = htobe32(rec); + vbuf[1] = htobe64(rec); /* * Copy from the in-memory hashtable of pending @@ -726,8 +726,8 @@ index_merge(const struct of *of, struct mparse *mp, seq = R_NEXT; assert(sizeof(uint64_t) == val.size); memcpy(&mask, val.data, val.size); - vbuf.mask = htobe64(mask); - val.size = sizeof(struct db_val); + vbuf[0] = htobe64(mask); + val.size = sizeof(vbuf); val.data = &vbuf; dbt_put(mdb->db, mdb->dbn, &key, &val); } @@ -768,7 +768,7 @@ index_prune(const struct of *ofile, struct mdb *mdb, struct recs *recs) { const struct of *of; const char *fn; - struct db_val *vbuf; + uint64_t vbuf[2]; unsigned seq, sseq; DBT key, val; int ch; @@ -817,11 +817,11 @@ index_prune(const struct of *ofile, struct mdb *mdb, struct recs *recs) while (0 == (ch = (*mdb->db->seq)(mdb->db, &key, &val, sseq))) { sseq = R_NEXT; - if (sizeof(struct db_val) != val.size) + if (sizeof(vbuf) != val.size) break; - vbuf = val.data; - if (recs->last != betoh32(vbuf->rec)) + memcpy(vbuf, val.data, val.size); + if (recs->last != betoh64(vbuf[1])) continue; if ((ch = (*mdb->db->del)(mdb->db, |