Commit e2863a78 authored by Yury Norov's avatar Yury Norov
Browse files

lib/bitmap: change return types to bool where appropriate 



Some bitmap functions return boolean results in int variables. Fix it
by changing return types to bool.

Signed-off-by: default avatarYury Norov <yury.norov@gmail.com>
parent 0b4736a4

include/linux/bitmap.h

+4 −4
Original line number Diff line number Diff line
@@ -148,13 +148,13 @@ void __bitmap_shift_left(unsigned long *dst, const unsigned long *src, 
			 unsigned int shift, unsigned int nbits);

void bitmap_cut(unsigned long *dst, const unsigned long *src,

		unsigned int first, unsigned int cut, unsigned int nbits);

int __bitmap_and(unsigned long *dst, const unsigned long *bitmap1,

bool __bitmap_and(unsigned long *dst, const unsigned long *bitmap1,

		 const unsigned long *bitmap2, unsigned int nbits);

void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1,

		 const unsigned long *bitmap2, unsigned int nbits);

void __bitmap_xor(unsigned long *dst, const unsigned long *bitmap1,

		  const unsigned long *bitmap2, unsigned int nbits);

int __bitmap_andnot(unsigned long *dst, const unsigned long *bitmap1,

bool __bitmap_andnot(unsigned long *dst, const unsigned long *bitmap1,

		    const unsigned long *bitmap2, unsigned int nbits);

void __bitmap_replace(unsigned long *dst,

		      const unsigned long *old, const unsigned long *new,
@@ -315,7 +315,7 @@ void bitmap_to_arr64(u64 *buf, const unsigned long *bitmap, unsigned int nbits); 
	bitmap_copy_clear_tail((unsigned long *)(buf), (const unsigned long *)(bitmap), (nbits))

#endif



static inline int bitmap_and(unsigned long *dst, const unsigned long *src1,

static inline bool bitmap_and(unsigned long *dst, const unsigned long *src1,

			const unsigned long *src2, unsigned int nbits)

{

	if (small_const_nbits(nbits))
@@ -341,7 +341,7 @@ static inline void bitmap_xor(unsigned long *dst, const unsigned long *src1, 
		__bitmap_xor(dst, src1, src2, nbits);

}



static inline int bitmap_andnot(unsigned long *dst, const unsigned long *src1,

static inline bool bitmap_andnot(unsigned long *dst, const unsigned long *src1,

			const unsigned long *src2, unsigned int nbits)

{

	if (small_const_nbits(nbits))

lib/bitmap.c

+2 −2
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ void bitmap_cut(unsigned long *dst, const unsigned long *src, 
}

EXPORT_SYMBOL(bitmap_cut);



int __bitmap_and(unsigned long *dst, const unsigned long *bitmap1,

bool __bitmap_and(unsigned long *dst, const unsigned long *bitmap1,

				const unsigned long *bitmap2, unsigned int bits)

{

	unsigned int k;
@@ -275,7 +275,7 @@ void __bitmap_xor(unsigned long *dst, const unsigned long *bitmap1, 
}

EXPORT_SYMBOL(__bitmap_xor);



int __bitmap_andnot(unsigned long *dst, const unsigned long *bitmap1,

bool __bitmap_andnot(unsigned long *dst, const unsigned long *bitmap1,

				const unsigned long *bitmap2, unsigned int bits)

{

	unsigned int k;

tools/include/linux/bitmap.h

+4 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
int __bitmap_weight(const unsigned long *bitmap, int bits);

void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1,

		 const unsigned long *bitmap2, int bits);

int __bitmap_and(unsigned long *dst, const unsigned long *bitmap1,

bool __bitmap_and(unsigned long *dst, const unsigned long *bitmap1,

		 const unsigned long *bitmap2, unsigned int bits);

bool __bitmap_equal(const unsigned long *bitmap1,

		    const unsigned long *bitmap2, unsigned int bits);
@@ -45,7 +45,7 @@ static inline void bitmap_fill(unsigned long *dst, unsigned int nbits) 
	dst[nlongs - 1] = BITMAP_LAST_WORD_MASK(nbits);

}



static inline int bitmap_empty(const unsigned long *src, unsigned nbits)

static inline bool bitmap_empty(const unsigned long *src, unsigned int nbits)

{

	if (small_const_nbits(nbits))

		return ! (*src & BITMAP_LAST_WORD_MASK(nbits));
@@ -53,7 +53,7 @@ static inline int bitmap_empty(const unsigned long *src, unsigned nbits) 
	return find_first_bit(src, nbits) == nbits;

}



static inline int bitmap_full(const unsigned long *src, unsigned int nbits)

static inline bool bitmap_full(const unsigned long *src, unsigned int nbits)

{

	if (small_const_nbits(nbits))

		return ! (~(*src) & BITMAP_LAST_WORD_MASK(nbits));
@@ -146,7 +146,7 @@ size_t bitmap_scnprintf(unsigned long *bitmap, unsigned int nbits, 
 * @src2: operand 2

 * @nbits: size of bitmap

 */

static inline int bitmap_and(unsigned long *dst, const unsigned long *src1,

static inline bool bitmap_and(unsigned long *dst, const unsigned long *src1,

			     const unsigned long *src2, unsigned int nbits)

{

	if (small_const_nbits(nbits))

tools/lib/bitmap.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ size_t bitmap_scnprintf(unsigned long *bitmap, unsigned int nbits, 
	return ret;

}



int __bitmap_and(unsigned long *dst, const unsigned long *bitmap1,

bool __bitmap_and(unsigned long *dst, const unsigned long *bitmap1,

		 const unsigned long *bitmap2, unsigned int bits)

{

	unsigned int k;