|
@@ -145,10 +145,12 @@ hashindex_read(const char *path)
|
|
bytes_read = fread(&header, 1, sizeof(HashHeader), fd);
|
|
bytes_read = fread(&header, 1, sizeof(HashHeader), fd);
|
|
if(bytes_read != sizeof(HashHeader)) {
|
|
if(bytes_read != sizeof(HashHeader)) {
|
|
if(ferror(fd)) {
|
|
if(ferror(fd)) {
|
|
- EPRINTF_PATH(path, "fread header failed (expected %ld, got %ld)", sizeof(HashHeader), bytes_read);
|
|
|
|
|
|
+ EPRINTF_PATH(path, "fread header failed (expected %ju, got %ju)",
|
|
|
|
+ (uintmax_t) sizeof(HashHeader), (uintmax_t) bytes_read);
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
- EPRINTF_MSG_PATH(path, "fread header failed (expected %ld, got %ld)", sizeof(HashHeader), bytes_read);
|
|
|
|
|
|
+ EPRINTF_MSG_PATH(path, "fread header failed (expected %ju, got %ju)",
|
|
|
|
+ (uintmax_t) sizeof(HashHeader), (uintmax_t) bytes_read);
|
|
}
|
|
}
|
|
goto fail;
|
|
goto fail;
|
|
}
|
|
}
|
|
@@ -170,7 +172,8 @@ hashindex_read(const char *path)
|
|
}
|
|
}
|
|
buckets_length = (off_t)_le32toh(header.num_buckets) * (header.key_size + header.value_size);
|
|
buckets_length = (off_t)_le32toh(header.num_buckets) * (header.key_size + header.value_size);
|
|
if(length != sizeof(HashHeader) + buckets_length) {
|
|
if(length != sizeof(HashHeader) + buckets_length) {
|
|
- EPRINTF_MSG_PATH(path, "Incorrect file length (expected %ld, got %ld)", sizeof(HashHeader) + buckets_length, length);
|
|
|
|
|
|
+ EPRINTF_MSG_PATH(path, "Incorrect file length (expected %ju, got %ju)",
|
|
|
|
+ (uintmax_t) sizeof(HashHeader) + buckets_length, (uintmax_t) length);
|
|
goto fail;
|
|
goto fail;
|
|
}
|
|
}
|
|
if(!(index = malloc(sizeof(HashIndex)))) {
|
|
if(!(index = malloc(sizeof(HashIndex)))) {
|
|
@@ -186,10 +189,12 @@ hashindex_read(const char *path)
|
|
bytes_read = fread(index->buckets, 1, buckets_length, fd);
|
|
bytes_read = fread(index->buckets, 1, buckets_length, fd);
|
|
if(bytes_read != buckets_length) {
|
|
if(bytes_read != buckets_length) {
|
|
if(ferror(fd)) {
|
|
if(ferror(fd)) {
|
|
- EPRINTF_PATH(path, "fread buckets failed (expected %ld, got %ld)", buckets_length, bytes_read);
|
|
|
|
|
|
+ EPRINTF_PATH(path, "fread buckets failed (expected %ju, got %ju)",
|
|
|
|
+ (uintmax_t) buckets_length, (uintmax_t) bytes_read);
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
- EPRINTF_MSG_PATH(path, "fread buckets failed (expected %ld, got %ld)", buckets_length, bytes_read);
|
|
|
|
|
|
+ EPRINTF_MSG_PATH(path, "fread buckets failed (expected %ju, got %ju)",
|
|
|
|
+ (uintmax_t) buckets_length, (uintmax_t) bytes_read);
|
|
}
|
|
}
|
|
free(index->buckets);
|
|
free(index->buckets);
|
|
free(index);
|
|
free(index);
|