bswap: convert get_be16, get_be32 and put_be32 to inline functions
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>
René Scharfe committed
Jul 15, 2017 at 21:22 UTC
5b114f3bb0820c1f57fb4a9cd14b62b55aa30d31
1 file changed
+24
-14
compat/bswap.h
+24
-14
@@ -162,19 +162,29 @@ static inline uint64_t git_bswap64(uint64_t x)
162
163
#else
164
165
-#define get_be16(p) ( \
166
- (*((unsigned char *)(p) + 0) << 8) | \
167
- (*((unsigned char *)(p) + 1) << 0) )
168
-#define get_be32(p) ( \
169
- ((uint32_t)*((unsigned char *)(p) + 0) << 24) | \
170
- ((uint32_t)*((unsigned char *)(p) + 1) << 16) | \
171
- ((uint32_t)*((unsigned char *)(p) + 2) << 8) | \
172
- ((uint32_t)*((unsigned char *)(p) + 3) << 0) )
173
-#define put_be32(p, v) do { \
174
- unsigned int __v = (v); \
175
- *((unsigned char *)(p) + 0) = __v >> 24; \
176
- *((unsigned char *)(p) + 1) = __v >> 16; \
177
- *((unsigned char *)(p) + 2) = __v >> 8; \
178
- *((unsigned char *)(p) + 3) = __v >> 0; } while (0)
165
+static inline uint16_t get_be16(const void *ptr)
166
+{
167
+ const unsigned char *p = ptr;
168
+ return (uint16_t)p[0] << 8 |
169
+ (uint16_t)p[1] << 0;
170
+}
171
+
172
+static inline uint32_t get_be32(const void *ptr)
173
+{
174
+ const unsigned char *p = ptr;
175
+ return (uint32_t)p[0] << 24 |
176
+ (uint32_t)p[1] << 16 |
177
+ (uint32_t)p[2] << 8 |
178
+ (uint32_t)p[3] << 0;
179
+}
180
+
181
+static inline void put_be32(void *ptr, uint32_t value)
182
+{
183
+ unsigned char *p = ptr;
184
+ p[0] = value >> 24;
185
+ p[1] = value >> 16;
186
+ p[2] = value >> 8;
187
+ p[3] = value >> 0;
188
+}
189
190
#endif