version 1.49.2.6, 2013/10/01 00:52:58 |
version 1.49.2.8, 2013/10/05 20:30:05 |
|
|
# include <libkern/OSByteOrder.h> |
# include <libkern/OSByteOrder.h> |
# include <db.h> |
# include <db.h> |
#else |
#else |
|
# include <sys/endian.h> |
# include <db.h> |
# include <db.h> |
#endif |
#endif |
|
|
Line 619 index_merge(const struct of *of, struct mparse *mp, |
|
Line 620 index_merge(const struct of *of, struct mparse *mp, |
|
uint64_t vbuf[2]; |
uint64_t vbuf[2]; |
char type; |
char type; |
|
|
|
static char emptystring[] = ""; |
|
|
if (warnings) { |
if (warnings) { |
files = NULL; |
files = NULL; |
hash_reset(&files); |
hash_reset(&files); |
Line 737 index_merge(const struct of *of, struct mparse *mp, |
|
Line 740 index_merge(const struct of *of, struct mparse *mp, |
|
val.data = NULL; |
val.data = NULL; |
val.size = 0; |
val.size = 0; |
if (0 == skip) |
if (0 == skip) |
val.data = ""; |
val.data = emptystring; |
else { |
else { |
ch = (*files->get)(files, &key, &val, 0); |
ch = (*files->get)(files, &key, &val, 0); |
if (ch < 0) { |
if (ch < 0) { |