Do not cast void pointers to pointers requiring alignment.

[mandoc.git] / apropos_db.c

diff --git a/apropos_db.c b/apropos_db.c
index 0d2b0728b41db8cd6d2fb06e7ead51acdc2a1a9f..41d7874245f2cd4470355ae5ee28a3226e59bd4b 100644 (file)
--- a/apropos_db.c
+++ b/apropos_db.c
@@ -1,4 +1,4 @@
-/*     $Id: apropos_db.c,v 1.24 2011/12/16 12:06:35 kristaps Exp $ */
+/*     $Id: apropos_db.c,v 1.27 2011/12/20 21:41:11 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -117,7 +117,7 @@ static      const struct type types[] = {
        { TYPE_Va, "Va" },
        { TYPE_Va, "Vt" },
        { TYPE_Xr, "Xr" },
-       { INT_MAX, "any" },
+       { UINT64_MAX, "any" },
        { 0, NULL }
 };
 
@@ -171,7 +171,7 @@ btree_read(const DBT *k, const DBT *v,
                const struct mchars *mc, 
                struct db_val *dbv, char **buf)
 {
-       const struct db_val *vp;
+       struct db_val    raw_dbv;
 
        /* Are our sizes sane? */
        if (k->size < 2 || sizeof(struct db_val) != v->size)
@@ -181,10 +181,10 @@ btree_read(const DBT *k, const DBT *v,
        if ('\0' != ((const char *)k->data)[(int)k->size - 1])
                return(0);
 
-       vp = v->data;
        norm_string((const char *)k->data, mc, buf);
-       dbv->rec = betoh32(vp->rec);
-       dbv->mask = betoh64(vp->mask);
+       memcpy(&raw_dbv, v->data, v->size);
+       dbv->rec = betoh32(raw_dbv.rec);
+       dbv->mask = betoh64(raw_dbv.mask);
        return(1);
 }
 
@@ -197,7 +197,7 @@ btree_read(const DBT *k, const DBT *v,
 static size_t
 norm_utf8(unsigned int cp, char out[7])
 {
-       size_t           rc;
+       int              rc;
 
        rc = 0;
 
@@ -238,7 +238,7 @@ norm_utf8(unsigned int cp, char out[7])
                return(0);
 
        out[rc] = '\0';
-       return(rc);
+       return((size_t)rc);
 }
 
 /*
@@ -380,7 +380,8 @@ index_read(const DBT *key, const DBT *val, int index,
                return(0);
 
        cp = val->data;
-       rec->res.rec = *(recno_t *)key->data;
+       assert(sizeof(recno_t) == key->size);
+       memcpy(&rec->res.rec, key->data, key->size);
        rec->res.volume = index;
 
        if ('d' == (type = *cp++))