Fix gcc -Wall warnings in libuuid

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

diff --git a/lib/ext2fs/bmove.c b/lib/ext2fs/bmove.c
index fbb5f9b..7d4b21a 100644 (file)
--- a/lib/ext2fs/bmove.c
+++ b/lib/ext2fs/bmove.c
@@ -18,16 +18,11 @@
 #include <sys/time.h>
 #endif
 
-#if EXT2_FLAT_INCLUDES
 #include "ext2_fs.h"
-#else
-#include <linux/ext2_fs.h>
-#endif
-
 #include "ext2fsP.h"
 
 struct process_block_struct {
-       ino_t                   ino;
+       ext2_ino_t              ino;
        struct ext2_inode *     inode;
        ext2fs_block_bitmap     reserve;
        ext2fs_block_bitmap     alloc_map;
@@ -78,7 +73,7 @@ static int process_block(ext2_filsys fs, blk_t        *block_nr,
                ext2fs_mark_block_bitmap(pb->alloc_map, block);
                ret = BLOCK_CHANGED;
                if (pb->flags & EXT2_BMOVE_DEBUG)
-                       printf("ino=%ld, blockcnt=%lld, %d->%d\n", pb->ino,
+                       printf("ino=%ld, blockcnt=%lld, %u->%u\n", pb->ino,
                               blockcnt, orig, block);
        }
        if (pb->add_dir) {
@@ -97,7 +92,7 @@ errcode_t ext2fs_move_blocks(ext2_filsys fs,
                             ext2fs_block_bitmap alloc_map,
                             int flags)
 {
-       ino_t   ino;
+       ext2_ino_t      ino;
        struct ext2_inode inode;
        errcode_t       retval;
        struct process_block_struct pb;
@@ -113,7 +108,7 @@ errcode_t ext2fs_move_blocks(ext2_filsys fs,
        pb.alloc_map = alloc_map ? alloc_map : fs->block_map;
        pb.flags = flags;
        
-       retval = ext2fs_get_mem(fs->blocksize * 4, (void **) &block_buf);
+       retval = ext2fs_get_array(4, fs->blocksize, &block_buf);
        if (retval)
                return retval;
        pb.buf = block_buf + fs->blocksize * 3;