diff options
| author | Karsten Blees <blees@dcon.de> | 2014-11-27 08:24:01 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-01 05:07:34 +0300 |
| commit | b5007211b6582fc38647ff695b5ac51541ea9de8 (patch) | |
| tree | 4208da1ac8c0929519656f951f43384e8970fa5c /csum-file.h | |
| parent | 68f4e1fc6abd332726dd281c76dd63ce7d13d7a1 (diff) | |
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 'csum-file.h')
| -rw-r--r-- | csum-file.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/csum-file.h b/csum-file.h index 9dedb038ea..da612c59c1 100644 --- a/csum-file.h +++ b/csum-file.h @@ -39,4 +39,15 @@ extern void sha1flush(struct sha1file *f); extern void crc32_begin(struct sha1file *); extern uint32_t crc32_end(struct sha1file *); +static inline void sha1write_u8(struct sha1file *f, uint8_t data) +{ + sha1write(f, &data, sizeof(data)); +} + +static inline void sha1write_be32(struct sha1file *f, uint32_t data) +{ + data = htonl(data); + sha1write(f, &data, sizeof(data)); +} + #endif |