From 108f3021a6b68a86eae3bd9da7f9ce8a1568ce50 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Tue, 15 Jun 2021 21:53:31 -0700 Subject: [PATCH] mke2fs: use ext2fs_get_device_size2() on all platforms Since commit e8c858047be6 ("libext2fs: fix build issue for on Windows/Cygwin systems"), ext2fs_get_device_size2() is available in Windows builds of libext2fs. So there is no need for mke2fs to call ext2fs_get_device_size() instead. This fixes a -Wincompatible-pointer-types warning because ext2fs_get_device_size() was being passed a 'blk64_t *', but it expected a 'blk_t *'. Signed-off-by: Eric Biggers Signed-off-by: Theodore Ts'o --- misc/mke2fs.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/misc/mke2fs.c b/misc/mke2fs.c index afbcf486b..d5ab334ed 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -1989,15 +1989,9 @@ profile_error: dev_size = fs_blocks_count; retval = 0; } else -#ifndef _WIN32 retval = ext2fs_get_device_size2(device_name, EXT2_BLOCK_SIZE(&fs_param), &dev_size); -#else - retval = ext2fs_get_device_size(device_name, - EXT2_BLOCK_SIZE(&fs_param), - &dev_size); -#endif if (retval && (retval != EXT2_ET_UNIMPLEMENTED)) { com_err(program_name, retval, "%s", _("while trying to determine filesystem size")); -- 2.47.2