Fix broken transfer from hashtable to btree for makewhatis.c.

[mandoc.git] / makewhatis.c

diff --git a/makewhatis.c b/makewhatis.c
index 0b767704c11724ed32be219a684ba9d7e274eb42..433dfcbb35969e3080dbae874e15e0be10a98e31 100644 (file)
--- a/makewhatis.c
+++ b/makewhatis.c
@@ -1,4 +1,4 @@
-/*     $Id: makewhatis.c,v 1.6 2011/06/21 14:16:05 kristaps Exp $ */
+/*     $Id: makewhatis.c,v 1.7 2011/06/21 23:37:27 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -416,16 +416,17 @@ main(int argc, char *argv[])
 
                seq = R_FIRST;
                while (0 == (ch = (*hash->seq)(hash, &key, &val, seq))) {
+                       seq = R_NEXT;
+
                        memcpy(vbuf, val.data, sizeof(uint32_t));
                        val.size = sizeof(vbuf);
                        val.data = vbuf;
+
                        dbt_put(db, fbbuf, &key, &val);
 
-                       if ((*hash->del)(hash, &key, 0) < 0) {
-                               perror("hash");
-                               exit((int)MANDOCLEVEL_SYSERR);
-                       }
-                       seq = R_NEXT;
+                       ch = (*hash->del)(hash, &key, R_CURSOR);
+                       if (ch < 0)
+                               break;
                }
 
                if (ch < 0) {
@@ -746,11 +747,12 @@ hash_put(DB *db, const struct buf *buf, int mask)
        DBT              key, val;
        int              rc;
 
-       key.data = buf->cp;
-
-       if ((key.size = buf->len) < 2)
+       if (buf->len < 2)
                return;
 
+       key.data = buf->cp;
+       key.size = buf->len;
+
        if ((rc = (*db->get)(db, &key, &val, 0)) < 0) {
                perror("hash");
                exit((int)MANDOCLEVEL_SYSERR);
@@ -760,9 +762,6 @@ hash_put(DB *db, const struct buf *buf, int mask)
        val.data = &mask;
        val.size = sizeof(int); 
 
-       /*fprintf(stderr, "Hashing: [%s] (0x%x)\n", 
-                       (char *)key.data, mask);*/
-
        if ((rc = (*db->put)(db, &key, &val, 0)) < 0) {
                perror("hash");
                exit((int)MANDOCLEVEL_SYSERR);