2011-06-10 06:11:31

by Andreas Dilger

[permalink] [raw]
Subject: [PATCH] ext2fs: fix ext2fs_warn_bitmap32() return warning

This was reported as "control reaches end of non-void function",
but comparing to other similar functions it should be a void
function. Since it is only declared in the "private" ext2fsP.h
header, it should be OK to change the function prototype.

Signed-off-by: Andreas Dilger <[email protected]>
---
lib/ext2fs/ext2fsP.h | 2 +-
lib/ext2fs/gen_bitmap64.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ext2fs/ext2fsP.h b/lib/ext2fs/ext2fsP.h
index ab9ee76..b182d7f 100644
--- a/lib/ext2fs/ext2fsP.h
+++ b/lib/ext2fs/ext2fsP.h
@@ -138,6 +138,6 @@ extern errcode_t ext2fs_set_generic_bmap_range(ext2fs_generic_bitmap bitmap,
extern errcode_t ext2fs_get_generic_bmap_range(ext2fs_generic_bitmap bitmap,
__u64 start, unsigned int num,
void *out);
-extern int ext2fs_warn_bitmap32(ext2fs_generic_bitmap bitmap, const char *func);
+extern void ext2fs_warn_bitmap32(ext2fs_generic_bitmap bitmap,const char *func);

extern int ext2fs_mem_is_zero(const char *mem, size_t len);
diff --git a/lib/ext2fs/gen_bitmap64.c b/lib/ext2fs/gen_bitmap64.c
index 94809cd..294194c 100644
--- a/lib/ext2fs/gen_bitmap64.c
+++ b/lib/ext2fs/gen_bitmap64.c
@@ -548,7 +548,7 @@ void ext2fs_unmark_block_bitmap_range2(ext2fs_block_bitmap bmap,
bmap->bitmap_ops->unmark_bmap_extent(bmap, block, num);
}

-int ext2fs_warn_bitmap32(ext2fs_generic_bitmap bitmap, const char *func)
+void ext2fs_warn_bitmap32(ext2fs_generic_bitmap bitmap, const char *func)
{
#ifndef OMIT_COM_ERR
if (bitmap && bitmap->description)
--
1.7.3.4



2011-06-11 15:33:28

by Theodore Ts'o

[permalink] [raw]
Subject: Re: [PATCH] ext2fs: fix ext2fs_warn_bitmap32() return warning

On Fri, Jun 10, 2011 at 12:11:30AM -0600, Andreas Dilger wrote:
> This was reported as "control reaches end of non-void function",
> but comparing to other similar functions it should be a void
> function. Since it is only declared in the "private" ext2fsP.h
> header, it should be OK to change the function prototype.
>
> Signed-off-by: Andreas Dilger <[email protected]>

Applied to the next branch, thanks.

- Ted