diff options
| author | Karsten Blees <blees@dcon.de> | 2014-11-27 00:24:01 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-11-30 18:07:34 -0800 |
| commit | b5007211b6582fc38647ff695b5ac51541ea9de8 (patch) | |
| tree | 4208da1ac8c0929519656f951f43384e8970fa5c /pack-bitmap-write.c | |
| parent | 68f4e1fc6abd332726dd281c76dd63ce7d13d7a1 (diff) | |
| download | git-b5007211b6582fc38647ff695b5ac51541ea9de8.tar.gz | |
pack-bitmap: do not use gcc packed attribute
The "__attribute__" flag may be a noop on some compilers.
That's OK as long as the code is correct without the
attribute, but in this case it is not. We would typically
end up with a struct that is 2 bytes too long due to struct
padding, breaking both reading and writing of bitmaps.
Instead of marshalling the data in a struct, let's just
provide helpers for reading and writing the appropriate
types. Besides being correct on all platforms, the result is
more efficient and simpler to read.
Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pack-bitmap-write.c')
| -rw-r--r-- | pack-bitmap-write.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c index 1218befaf2..5d353ad6a7 100644 --- a/pack-bitmap-write.c +++ b/pack-bitmap-write.c @@ -473,7 +473,6 @@ static void write_selected_commits_v1(struct sha1file *f, for (i = 0; i < writer.selected_nr; ++i) { struct bitmapped_commit *stored = &writer.selected[i]; - struct bitmap_disk_entry on_disk; int commit_pos = sha1_pos(stored->commit->object.sha1, index, index_nr, sha1_access); @@ -481,11 +480,10 @@ static void write_selected_commits_v1(struct sha1file *f, if (commit_pos < 0) die("BUG: trying to write commit not in index"); - on_disk.object_pos = htonl(commit_pos); - on_disk.xor_offset = stored->xor_offset; - on_disk.flags = stored->flags; + sha1write_be32(f, commit_pos); + sha1write_u8(f, stored->xor_offset); + sha1write_u8(f, stored->flags); - sha1write(f, &on_disk, sizeof(on_disk)); dump_bitmap(f, stored->write_as); } } |