diff options
| author | René Scharfe <l.s.r@web.de> | 2017-07-15 21:22:50 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-17 14:54:15 -0700 |
| commit | 5b114f3bb0820c1f57fb4a9cd14b62b55aa30d31 (patch) | |
| tree | d25d178ba9b7e81860f61dd656732ff13d96de7f | |
| parent | 7780af1e8edf158f503794dbdb87787999daa086 (diff) | |
| download | git-rs/bswap-ubsan-fix.tar.gz | |
bswap: convert get_be16, get_be32 and put_be32 to inline functionsrs/bswap-ubsan-fix
Simplify the implementation and allow callers to use expressions with
side-effects by turning the macros get_be16, get_be32 and put_be32 into
inline functions.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | compat/bswap.h | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/compat/bswap.h b/compat/bswap.h index 4582c1107a..7d063e9e40 100644 --- a/compat/bswap.h +++ b/compat/bswap.h @@ -162,19 +162,29 @@ static inline uint64_t git_bswap64(uint64_t x) #else -#define get_be16(p) ( \ - (*((unsigned char *)(p) + 0) << 8) | \ - (*((unsigned char *)(p) + 1) << 0) ) -#define get_be32(p) ( \ - ((uint32_t)*((unsigned char *)(p) + 0) << 24) | \ - ((uint32_t)*((unsigned char *)(p) + 1) << 16) | \ - ((uint32_t)*((unsigned char *)(p) + 2) << 8) | \ - ((uint32_t)*((unsigned char *)(p) + 3) << 0) ) -#define put_be32(p, v) do { \ - unsigned int __v = (v); \ - *((unsigned char *)(p) + 0) = __v >> 24; \ - *((unsigned char *)(p) + 1) = __v >> 16; \ - *((unsigned char *)(p) + 2) = __v >> 8; \ - *((unsigned char *)(p) + 3) = __v >> 0; } while (0) +static inline uint16_t get_be16(const void *ptr) +{ + const unsigned char *p = ptr; + return (uint16_t)p[0] << 8 | + (uint16_t)p[1] << 0; +} + +static inline uint32_t get_be32(const void *ptr) +{ + const unsigned char *p = ptr; + return (uint32_t)p[0] << 24 | + (uint32_t)p[1] << 16 | + (uint32_t)p[2] << 8 | + (uint32_t)p[3] << 0; +} + +static inline void put_be32(void *ptr, uint32_t value) +{ + unsigned char *p = ptr; + p[0] = value >> 24; + p[1] = value >> 16; + p[2] = value >> 8; + p[3] = value >> 0; +} #endif |