refactor: use bitsizeof() instead of 8 * sizeof()
Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
67da52bedc
commit
f630cfda88
@ -26,6 +26,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
|
#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
|
||||||
|
#define bitsizeof(x) (CHAR_BIT * sizeof(x))
|
||||||
|
|
||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
#define TYPEOF(x) (__typeof__(x))
|
#define TYPEOF(x) (__typeof__(x))
|
||||||
@ -33,7 +34,7 @@
|
|||||||
#define TYPEOF(x)
|
#define TYPEOF(x)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define MSB(x, bits) ((x) & TYPEOF(x)(~0ULL << (sizeof(x) * 8 - (bits))))
|
#define MSB(x, bits) ((x) & TYPEOF(x)(~0ULL << (bitsizeof(x) - (bits))))
|
||||||
#define HAS_MULTI_BITS(i) ((i) & ((i) - 1)) /* checks if an integer has more than 1 bit set */
|
#define HAS_MULTI_BITS(i) ((i) & ((i) - 1)) /* checks if an integer has more than 1 bit set */
|
||||||
|
|
||||||
/* Approximation of the length of the decimal representation of this type. */
|
/* Approximation of the length of the decimal representation of this type. */
|
||||||
|
@ -1170,7 +1170,7 @@ unsigned long unpack_object_header_buffer(const unsigned char *buf,
|
|||||||
size = c & 15;
|
size = c & 15;
|
||||||
shift = 4;
|
shift = 4;
|
||||||
while (c & 0x80) {
|
while (c & 0x80) {
|
||||||
if (len <= used || sizeof(long) * 8 <= shift) {
|
if (len <= used || bitsizeof(long) <= shift) {
|
||||||
error("bad object header");
|
error("bad object header");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
|
|
||||||
#define XDL_MAX_COST_MIN 256
|
#define XDL_MAX_COST_MIN 256
|
||||||
#define XDL_HEUR_MIN_COST 256
|
#define XDL_HEUR_MIN_COST 256
|
||||||
#define XDL_LINE_MAX (long)((1UL << (8 * sizeof(long) - 1)) - 1)
|
#define XDL_LINE_MAX (long)((1UL << (CHAR_BIT * sizeof(long) - 1)) - 1)
|
||||||
#define XDL_SNAKE_CNT 20
|
#define XDL_SNAKE_CNT 20
|
||||||
#define XDL_K_HEUR 4
|
#define XDL_K_HEUR 4
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user