mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/hashwrite-be64'

Browse Source 
Code simplification.

* rs/hashwrite-be64:
  pack-write: use hashwrite_be64()
  midx: use hashwrite_be64()
  csum-file: add hashwrite_be64()
This commit is contained in:
Junio C Hamano
2020-11-25 15:24:52 -08:00
parent 2557c1183a 970909c2a7
commit 455e8d18f8
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
csum-file.h
View File

@ -62,4 +62,11 @@ static inline void hashwrite_be32(struct hashfile *f, uint32_t data)
hashwrite(f, &data, sizeof(data)); hashwrite(f, &data, sizeof(data));
} }
static inline size_t hashwrite_be64(struct hashfile *f, uint64_t data)
{
data = htonll(data);
hashwrite(f, &data, sizeof(data));
return sizeof(data);
}
#endif #endif

7
midx.c
View File

@ -785,9 +785,7 @@ static size_t write_midx_large_offsets(struct hashfile *f, uint32_t nr_large_off
if (!(offset >> 31)) if (!(offset >> 31))
continue; continue;
hashwrite_be32(f, offset >> 32); written += hashwrite_be64(f, offset);
hashwrite_be32(f, offset & 0xffffffffUL);
written += 2 * sizeof(uint32_t);
nr_large_offset--; nr_large_offset--;
} }
@ -975,8 +973,7 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
chunk_offsets[i]); chunk_offsets[i]);
hashwrite_be32(f, chunk_ids[i]); hashwrite_be32(f, chunk_ids[i]);
hashwrite_be32(f, chunk_offsets[i] >> 32); hashwrite_be64(f, chunk_offsets[i]);
hashwrite_be32(f, chunk_offsets[i]);
written += MIDX_CHUNKLOOKUP_WIDTH; written += MIDX_CHUNKLOOKUP_WIDTH;
} }

5
pack-write.c
View File

@ -151,13 +151,10 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec
while (nr_large_offset) { while (nr_large_offset) {
struct pack_idx_entry *obj = *list++; struct pack_idx_entry *obj = *list++;
uint64_t offset = obj->offset; uint64_t offset = obj->offset;
uint32_t split[2];
if (!need_large_offset(offset, opts)) if (!need_large_offset(offset, opts))
continue; continue;
split[0] = htonl(offset >> 32); hashwrite_be64(f, offset);
split[1] = htonl(offset & 0xffffffff);
hashwrite(f, split, 8);
nr_large_offset--; nr_large_offset--;
} }
} }