Build lib/ext2fs/ext2_err.h early to avoid parallel build problems

[tools/e2fsprogs.git] / lib / ext2fs / bitops.c

diff --git a/lib/ext2fs/bitops.c b/lib/ext2fs/bitops.c
index e27c5a0..9c34847 100644 (file)
--- a/lib/ext2fs/bitops.c
+++ b/lib/ext2fs/bitops.c
@@ -30,38 +30,38 @@
  * systems, as well as non-32 bit systems.
  */
 
-int ext2fs_set_bit(int nr,void * addr)
+int ext2fs_set_bit(unsigned int nr,void * addr)
 {
        int             mask, retval;
        unsigned char   *ADDR = (unsigned char *) addr;
 
        ADDR += nr >> 3;
        mask = 1 << (nr & 0x07);
-       retval = (mask & *ADDR) != 0;
+       retval = mask & *ADDR;
        *ADDR |= mask;
        return retval;
 }
 
-int ext2fs_clear_bit(int nr, void * addr)
+int ext2fs_clear_bit(unsigned int nr, void * addr)
 {
        int             mask, retval;
        unsigned char   *ADDR = (unsigned char *) addr;
 
        ADDR += nr >> 3;
        mask = 1 << (nr & 0x07);
-       retval = (mask & *ADDR) != 0;
+       retval = mask & *ADDR;
        *ADDR &= ~mask;
        return retval;
 }
 
-int ext2fs_test_bit(int nr, const void * addr)
+int ext2fs_test_bit(unsigned int nr, const void * addr)
 {
        int                     mask;
        const unsigned char     *ADDR = (const unsigned char *) addr;
 
        ADDR += nr >> 3;
        mask = 1 << (nr & 0x07);
-       return ((mask & *ADDR) != 0);
+       return (mask & *ADDR);
 }
 
 #endif /* !_EXT2_HAVE_ASM_BITOPS_ */
@@ -71,21 +71,8 @@ void ext2fs_warn_bitmap(errcode_t errcode, unsigned long arg,
 {
 #ifndef OMIT_COM_ERR
        if (description)
-               com_err(0, errcode, "#%u for %s", arg, description);
+               com_err(0, errcode, "#%lu for %s", arg, description);
        else
-               com_err(0, errcode, "#%u", arg);
+               com_err(0, errcode, "#%lu", arg);
 #endif
 }
-
-void ext2fs_warn_bitmap2(ext2fs_generic_bitmap bitmap,
-                           int code, unsigned long arg)
-{
-#ifndef OMIT_COM_ERR
-       if (bitmap->description)
-               com_err(0, bitmap->base_error_code+code,
-                       "#%u for %s", arg, bitmap->description);
-       else
-               com_err(0, bitmap->base_error_code + code, "#%u", arg);
-#endif
-}
-