version 1.18, 2011/12/01 21:05:49 |
version 1.19, 2011/12/01 23:46:26 |
|
|
#include <string.h> |
#include <string.h> |
#include <unistd.h> |
#include <unistd.h> |
|
|
|
#include <arpa/inet.h> |
|
|
#ifdef __linux__ |
#ifdef __linux__ |
# include <db_185.h> |
# include <db_185.h> |
#else |
#else |
Line 626 index_merge(const struct of *of, struct mparse *mp, |
|
Line 628 index_merge(const struct of *of, struct mparse *mp, |
|
* into the database. |
* into the database. |
*/ |
*/ |
|
|
vbuf.rec = rec; |
vbuf.rec = htonl(rec); |
seq = R_FIRST; |
seq = R_FIRST; |
while (0 == (ch = (*hash->seq)(hash, &key, &val, seq))) { |
while (0 == (ch = (*hash->seq)(hash, &key, &val, seq))) { |
seq = R_NEXT; |
seq = R_NEXT; |
|
|
vbuf.mask = *(uint64_t *)val.data; |
vbuf.mask = *(uint64_t *)val.data; |
val.size = sizeof(struct db_val); |
val.size = sizeof(struct db_val); |
val.data = &vbuf; |
val.data = &vbuf; |
|
|
dbt_put(db, dbf, &key, &val); |
dbt_put(db, dbf, &key, &val); |
} |
} |
if (ch < 0) { |
if (ch < 0) { |
Line 732 index_prune(const struct of *ofile, DB *db, const char |
|
Line 732 index_prune(const struct of *ofile, DB *db, const char |
|
break; |
break; |
|
|
vbuf = val.data; |
vbuf = val.data; |
if (*maxrec != vbuf->rec) |
if (*maxrec != ntohl(vbuf->rec)) |
continue; |
continue; |
|
|
if ((ch = (*db->del)(db, &key, R_CURSOR)) < 0) |
if ((ch = (*db->del)(db, &key, R_CURSOR)) < 0) |